diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-03-27 10:42:47 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-03-27 10:42:47 +0000 |
commit | 4225e4b2d8fe131d93df97916b77910c0906c1ad (patch) | |
tree | 52a27698f502489b680f8bdca34d9df20b95d8a6 /package/hostapd/patches/310-multicall_bridge_fix.patch | |
parent | 35607da5b8150cb2d10e0e5e9c521f19ca47f677 (diff) | |
download | upstream-4225e4b2d8fe131d93df97916b77910c0906c1ad.tar.gz upstream-4225e4b2d8fe131d93df97916b77910c0906c1ad.tar.bz2 upstream-4225e4b2d8fe131d93df97916b77910c0906c1ad.zip |
hostapd: update to 20120326
SVN-Revision: 31080
Diffstat (limited to 'package/hostapd/patches/310-multicall_bridge_fix.patch')
-rw-r--r-- | package/hostapd/patches/310-multicall_bridge_fix.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/package/hostapd/patches/310-multicall_bridge_fix.patch b/package/hostapd/patches/310-multicall_bridge_fix.patch new file mode 100644 index 0000000000..2ee198a173 --- /dev/null +++ b/package/hostapd/patches/310-multicall_bridge_fix.patch @@ -0,0 +1,45 @@ +--- a/src/drivers/driver_nl80211.c ++++ b/src/drivers/driver_nl80211.c +@@ -886,6 +886,10 @@ static void wpa_driver_nl80211_event_rtm + return; + } + ++ if (ifi->ifi_family == AF_BRIDGE && ++ drv->nlmode != NL80211_IFTYPE_AP) ++ return; ++ + wpa_printf(MSG_DEBUG, "RTM_NEWLINK: operstate=%d ifi_flags=0x%x " + "(%s%s%s%s)", + drv->operstate, ifi->ifi_flags, +@@ -993,6 +997,10 @@ static void wpa_driver_nl80211_event_rtm + attrlen = len; + attr = (struct rtattr *) buf; + ++ if (ifi->ifi_family == AF_BRIDGE && ++ drv->nlmode != NL80211_IFTYPE_AP) ++ return; ++ + rta_len = RTA_ALIGN(sizeof(struct rtattr)); + while (RTA_OK(attr, attrlen)) { + if (attr->rta_type == IFLA_IFNAME) { +@@ -2920,6 +2928,11 @@ static void * wpa_driver_nl80211_init(vo + drv->ap_scan_as_station = NL80211_IFTYPE_UNSPECIFIED; + drv->nlmode = NL80211_IFTYPE_STATION; + ++#ifdef HOSTAPD ++ drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int); ++ drv->if_indices = drv->default_if_indices; ++#endif ++ + if (wpa_driver_nl80211_init_nl(drv)) { + os_free(drv); + return NULL; +@@ -7654,8 +7667,6 @@ static void *i802_init(struct hostapd_da + br_ifindex = 0; + } + +- drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int); +- drv->if_indices = drv->default_if_indices; + for (i = 0; i < params->num_bridge; i++) { + if (params->bridge[i]) { + ifindex = if_nametoindex(params->bridge[i]); |