backport mac80211, hostapd, iw, crda from trunk as of r26369

[openwrt-10.03/.git] / package / hostapd / patches / 330-multicall_bridge_fix.patch

diff --git a/package/hostapd/patches/430-supplicant_bridge_fix.patch b/package/hostapd/patches/330-multicall_bridge_fix.patch
similarity index 72%
rename from package/hostapd/patches/430-supplicant_bridge_fix.patch
rename to package/hostapd/patches/330-multicall_bridge_fix.patch
index feddf6fed0883df5ca0737ef9a4b8a0ab4b42663..96456ea728b5356d1a51075e330364510da3c369 100644 (file)
--- a/package/hostapd/patches/430-supplicant_bridge_fix.patch
+++ b/package/hostapd/patches/330-multicall_bridge_fix.patch
@@ -1,6 +1,6 @@
 --- a/src/drivers/driver_nl80211.c
 +++ b/src/drivers/driver_nl80211.c
-@@ -410,6 +410,10 @@ static void wpa_driver_nl80211_event_rtm
+@@ -464,6 +464,10 @@ static void wpa_driver_nl80211_event_rtm
                return;
        }
  
@@ -11,7 +11,7 @@
        wpa_printf(MSG_DEBUG, "RTM_NEWLINK: operstate=%d ifi_flags=0x%x "
                   "(%s%s%s%s)",
                   drv->operstate, ifi->ifi_flags,
-@@ -481,6 +485,10 @@ static void wpa_driver_nl80211_event_rtm
+@@ -535,6 +539,10 @@ static void wpa_driver_nl80211_event_rtm
        attrlen = len;
        attr = (struct rtattr *) buf;
  
@@ -22,9 +22,9 @@
        rta_len = RTA_ALIGN(sizeof(struct rtattr));
        while (RTA_OK(attr, attrlen)) {
                if (attr->rta_type == IFLA_IFNAME) {
-@@ -1347,6 +1355,11 @@ static int wpa_driver_nl80211_init_nl(st
-       eloop_register_read_sock(nl_socket_get_fd(drv->nl_handle_event),
-                                wpa_driver_nl80211_event_receive, drv, ctx);
+@@ -1610,6 +1618,11 @@ static int wpa_driver_nl80211_capa(struc
+               drv->capa.flags |= WPA_DRIVER_FLAGS_P2P_CAPABLE;
+       drv->capa.max_remain_on_chan = info.max_remain_on_chan;
  
 +#ifdef HOSTAPD
 +      drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int);
@@ -32,9 +32,9 @@
 +#endif
 +
        return 0;
+ }
  
- err4:
-@@ -4867,8 +4880,6 @@ static void *i802_init(struct hostapd_da
+@@ -5602,8 +5615,6 @@ static void *i802_init(struct hostapd_da
                br_ifindex = 0;
        }