a80c041d4a00a3da11f8b75d5a1ba469e7563554
[openwrt/svn-archive/archive.git] / package / network / services / hostapd / patches / 310-multicall_bridge_fix.patch
1 --- a/src/drivers/driver_nl80211.c
2 +++ b/src/drivers/driver_nl80211.c
3 @@ -899,6 +899,10 @@ static void wpa_driver_nl80211_event_rtm
4 return;
5 }
6
7 + if (ifi->ifi_family == AF_BRIDGE &&
8 + drv->nlmode != NL80211_IFTYPE_AP)
9 + return;
10 +
11 wpa_printf(MSG_DEBUG, "RTM_NEWLINK: operstate=%d ifi_flags=0x%x "
12 "(%s%s%s%s)",
13 drv->operstate, ifi->ifi_flags,
14 @@ -1006,6 +1010,10 @@ static void wpa_driver_nl80211_event_rtm
15 attrlen = len;
16 attr = (struct rtattr *) buf;
17
18 + if (ifi->ifi_family == AF_BRIDGE &&
19 + drv->nlmode != NL80211_IFTYPE_AP)
20 + return;
21 +
22 rta_len = RTA_ALIGN(sizeof(struct rtattr));
23 while (RTA_OK(attr, attrlen)) {
24 if (attr->rta_type == IFLA_IFNAME) {
25 @@ -3292,6 +3300,11 @@ static void * wpa_driver_nl80211_init(vo
26 drv->ap_scan_as_station = NL80211_IFTYPE_UNSPECIFIED;
27 drv->nlmode = NL80211_IFTYPE_STATION;
28
29 +#ifdef HOSTAPD
30 + drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int);
31 + drv->if_indices = drv->default_if_indices;
32 +#endif
33 +
34 if (wpa_driver_nl80211_init_nl(drv)) {
35 os_free(drv);
36 return NULL;
37 @@ -8296,8 +8309,6 @@ static void *i802_init(struct hostapd_da
38 br_ifindex = 0;
39 }
40
41 - drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int);
42 - drv->if_indices = drv->default_if_indices;
43 for (i = 0; i < params->num_bridge; i++) {
44 if (params->bridge[i]) {
45 ifindex = if_nametoindex(params->bridge[i]);