[package] hostapd: enforce CCMP WPA cipher if hwmode is 11ng or 11na

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

diff --git a/package/hostapd/patches/100-madwifi_fix.patch b/package/hostapd/patches/100-madwifi_fix.patch
index 3798398..736b295 100644 (file)
--- a/package/hostapd/patches/100-madwifi_fix.patch
+++ b/package/hostapd/patches/100-madwifi_fix.patch
@@ -1,27 +1,21 @@
---- a/hostapd/driver_madwifi.c
-+++ b/hostapd/driver_madwifi.c
-@@ -299,6 +299,7 @@ madwifi_set_iface_flags(void *priv, int 
- {
-       struct madwifi_driver_data *drv = priv;
-       struct ifreq ifr;
-+      short flags;
- 
-       wpa_printf(MSG_DEBUG, "%s: dev_up=%d", __func__, dev_up);
- 
-@@ -313,10 +314,14 @@ madwifi_set_iface_flags(void *priv, int 
-               return -1;
+--- a/src/drivers/driver_madwifi.c
++++ b/src/drivers/driver_madwifi.c
+@@ -1177,8 +1177,6 @@ madwifi_init(struct hostapd_data *hapd, 
+               goto bad;
        }
  
-+      flags = ifr.ifr_flags;
-       if (dev_up)
--              ifr.ifr_flags |= IFF_UP;
-+              flags |= IFF_UP;
-       else
--              ifr.ifr_flags &= ~IFF_UP;
-+              flags &= ~IFF_UP;
-+
-+      if (flags == ifr.ifr_flags)
-+              return 0;
+-      /* mark down during setup */
+-      linux_set_iface_flags(drv->ioctl_sock, drv->iface, 0);
+       madwifi_set_privacy(drv, 0); /* default to no privacy */
+ 
+       madwifi_receive_probe_req(drv);
+@@ -1268,8 +1266,7 @@ madwifi_set_countermeasures(void *priv, 
+ static int
+ madwifi_commit(void *priv)
+ {
+-      struct madwifi_driver_data *drv = priv;
+-      return linux_set_iface_flags(drv->ioctl_sock, drv->iface, 1);
++      return 0;
+ }
  
-       if (ioctl(drv->ioctl_sock, SIOCSIFFLAGS, &ifr) != 0) {
-               perror("ioctl[SIOCSIFFLAGS]");
+ #else /* HOSTAPD */