wpa_supplicant: fix interface combination parsing issues

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39155
This commit is contained in:
Felix Fietkau 2013-12-21 19:42:45 +00:00
parent df57b8dcb6
commit fd4cd3825b

View file

@ -0,0 +1,18 @@
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3157,10 +3157,12 @@ static int wiphy_info_iface_comb_process
}
if (combination_has_p2p && combination_has_mgd) {
- info->p2p_concurrent = 1;
- info->num_multichan_concurrent =
+ int num_channels =
nla_get_u32(tb_comb[NL80211_IFACE_COMB_NUM_CHANNELS]);
- return 1;
+
+ info->p2p_concurrent = 1;
+ if (info->num_multichan_concurrent < num_channels)
+ info->num_multichan_concurrent = num_channels;
}
return 0;