summaryrefslogtreecommitdiffstats
path: root/package/hostapd/patches/380-multicall_bridge_fix.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-09 01:36:36 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-09 01:36:36 +0000
commitacbc4c5f9530b1e9ef782baaf33c72bd7d775c1b (patch)
tree4eef31c26fcc6e6f251cb7bc2b3da3cd20927dd6 /package/hostapd/patches/380-multicall_bridge_fix.patch
parent929a8c4e3fdbc1763a917e2b698396fc694f3470 (diff)
hostapd: update to 20101109, reorganize patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23932 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hostapd/patches/380-multicall_bridge_fix.patch')
-rw-r--r--package/hostapd/patches/380-multicall_bridge_fix.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/package/hostapd/patches/380-multicall_bridge_fix.patch b/package/hostapd/patches/380-multicall_bridge_fix.patch
new file mode 100644
index 000000000..eb5d696f4
--- /dev/null
+++ b/package/hostapd/patches/380-multicall_bridge_fix.patch
@@ -0,0 +1,45 @@
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -452,6 +452,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,
+@@ -523,6 +527,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) {
+@@ -1490,6 +1498,11 @@ static int wpa_driver_nl80211_capa(struc
+ drv->capa.flags |= WPA_DRIVER_FLAGS_P2P_CAPABLE;
+ drv->capa.max_remain_on_chan = 5000;
+
++#ifdef HOSTAPD
++ drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int);
++ drv->if_indices = drv->default_if_indices;
++#endif
++
+ return 0;
+ }
+
+@@ -5184,8 +5197,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]);