mac80211: update to wireless-testing 2014-03-31
[openwrt/staging/dedeckeh.git] / package / network / services / hostapd / patches / 510-wpa_supplicant_p2p_parse_ifcomb.patch
1 --- a/src/drivers/driver_nl80211.c
2 +++ b/src/drivers/driver_nl80211.c
3 @@ -3157,10 +3157,12 @@ static int wiphy_info_iface_comb_process
4 }
5
6 if (combination_has_p2p && combination_has_mgd) {
7 - info->p2p_concurrent = 1;
8 - info->num_multichan_concurrent =
9 + int num_channels =
10 nla_get_u32(tb_comb[NL80211_IFACE_COMB_NUM_CHANNELS]);
11 - return 1;
12 +
13 + info->p2p_concurrent = 1;
14 + if (info->num_multichan_concurrent < num_channels)
15 + info->num_multichan_concurrent = num_channels;
16 }
17
18 return 0;