brcm47xx: update bcma and ssb to master-2011-07-21

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

diff --git a/package/hostapd/patches/330-multicall_bridge_fix.patch b/package/hostapd/patches/330-multicall_bridge_fix.patch
index 5e930f7..350e722 100644 (file)
--- a/package/hostapd/patches/330-multicall_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
-@@ -464,6 +464,10 @@ static void wpa_driver_nl80211_event_rtm
+@@ -475,6 +475,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,
-@@ -535,6 +539,10 @@ static void wpa_driver_nl80211_event_rtm
+@@ -546,6 +550,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) {
-@@ -1589,6 +1597,11 @@ static int wpa_driver_nl80211_capa(struc
-       drv->capa.flags |= WPA_DRIVER_FLAGS_P2P_CAPABLE;
-       drv->capa.max_remain_on_chan = 5000;
+@@ -1679,6 +1687,11 @@ static int wpa_driver_nl80211_capa(struc
+       drv->capa.flags |= WPA_DRIVER_FLAGS_EAPOL_TX_STATUS;
+       drv->capa.max_remain_on_chan = info.max_remain_on_chan;
  
 +#ifdef HOSTAPD
 +      drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int);
@@ -34,7 +34,7 @@
        return 0;
  }
  
-@@ -5561,8 +5574,6 @@ static void *i802_init(struct hostapd_da
+@@ -5715,8 +5728,6 @@ static void *i802_init(struct hostapd_da
                br_ifindex = 0;
        }