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 (file)
index 0000000..fe72ee2
--- /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;