openwrt: honour gcc extra configuration flags

[openwrt.git] / package / hostapd / patches / 100-madwifi_fixes.patch

diff --git a/package/hostapd/patches/100-madwifi_fixes.patch b/package/hostapd/patches/100-madwifi_fixes.patch
index eb7299b..74d0c44 100644 (file)
--- a/package/hostapd/patches/100-madwifi_fixes.patch
+++ b/package/hostapd/patches/100-madwifi_fixes.patch
@@ -1,40 +1,42 @@
-diff -ur hostapd.old/driver_madwifi.c hostapd.dev/driver_madwifi.c
---- hostapd.old/driver_madwifi.c       2006-03-25 20:55:18.000000000 +0100
-+++ hostapd.dev/driver_madwifi.c       2006-06-12 21:54:22.000000000 +0200
-@@ -20,11 +20,6 @@
- 
+Index: hostapd-0.5.7/driver_madwifi.c
+===================================================================
+--- hostapd-0.5.7.orig/driver_madwifi.c        2007-06-04 13:22:31.768025808 +0200
++++ hostapd-0.5.7/driver_madwifi.c     2007-06-04 13:22:32.051982640 +0200
+@@ -21,12 +21,9 @@

  #include <include/compat.h>
  #include <net80211/ieee80211.h>
  #include <include/compat.h>
  #include <net80211/ieee80211.h>

--#ifdef WME_NUM_AC
+ #ifdef WME_NUM_AC

 -/* Assume this is built against BSD branch of madwifi driver. */
 -#define MADWIFI_BSD
 -#include <net80211/_ieee80211.h>
 -#endif /* WME_NUM_AC */
  #include <net80211/ieee80211_crypto.h>
  #include <net80211/ieee80211_ioctl.h>
 -/* Assume this is built against BSD branch of madwifi driver. */
 -#define MADWIFI_BSD
 -#include <net80211/_ieee80211.h>
 -#endif /* WME_NUM_AC */
  #include <net80211/ieee80211_crypto.h>
  #include <net80211/ieee80211_ioctl.h>

++#endif /* WME_NUM_AC */

  
  

-@@ -168,7 +164,10 @@
-       }
+ #ifdef IEEE80211_IOCTL_SETWMMPARAMS
+ /* Assume this is built against madwifi-ng */
+@@ -169,6 +166,11 @@

        return 0;
  }
        return 0;
  }

--
+ 

 +static int madwifi_get_inact_sec(void *priv, const u8 *addr)
 +{
 +static int madwifi_get_inact_sec(void *priv, const u8 *addr)
 +{

-+return 0;
++      return 0;

 +}
 +}

++

  static int
  set80211param(struct madwifi_driver_data *drv, int op, int arg)
  {
  static int
  set80211param(struct madwifi_driver_data *drv, int op, int arg)
  {

-@@ -1204,8 +1203,6 @@
+@@ -1258,7 +1260,6 @@

                goto bad;
        }
  
 -      madwifi_set_iface_flags(drv, 0);        /* mark down during setup */
                goto bad;
        }
  
 -      madwifi_set_iface_flags(drv, 0);        /* mark down during setup */

--
+       madwifi_set_privacy(drv->iface, drv, 0); /* default to no privacy */
+ 

        hapd->driver = &drv->ops;
        hapd->driver = &drv->ops;

-       return 0;
- bad:
-@@ -1226,7 +1223,6 @@
+@@ -1281,7 +1282,6 @@

  
        drv->hapd->driver = NULL;
  
  
        drv->hapd->driver = NULL;
  


@@ -42,11 +44,11 @@ diff -ur hostapd.old/driver_madwifi.c hostapd.dev/driver_madwifi.c
        if (drv->ioctl_sock >= 0)
                close(drv->ioctl_sock);
        if (drv->sock_recv != NULL && drv->sock_recv != drv->sock_xmit)
        if (drv->ioctl_sock >= 0)
                close(drv->ioctl_sock);
        if (drv->sock_recv != NULL && drv->sock_recv != drv->sock_xmit)

-@@ -1306,6 +1452,7 @@
+@@ -1367,6 +1367,7 @@

        .get_ssid               = madwifi_get_ssid,
        .set_countermeasures    = madwifi_set_countermeasures,
        .sta_clear_stats        = madwifi_sta_clear_stats,
        .get_ssid               = madwifi_get_ssid,
        .set_countermeasures    = madwifi_set_countermeasures,
        .sta_clear_stats        = madwifi_sta_clear_stats,

-+      .get_inact_sec          = madwifi_get_inact_sec,
++      .get_inact_sec          = madwifi_get_inact_sec,
+       .commit                 = madwifi_commit,

  };
  
  };
  

- void madwifi_driver_register(void)