From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 21 Dec 2013 19:42:45 +0000 (+0000)
Subject: wpa_supplicant: fix interface combination parsing issues
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fd4cd3825b6a29f245dbf0809f37d6c1d5845944;p=openwrt%2Fstaging%2Fflorian.git

wpa_supplicant: fix interface combination parsing issues

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

SVN-Revision: 39155
---

diff --git a/package/network/services/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch b/package/network/services/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch
new file mode 100644
index 0000000000..fe72ee29c6
--- /dev/null
+++ b/package/network/services/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch
@@ -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;