aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-12-21 19:42:45 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-12-21 19:42:45 +0000
commite6a85bcd9a97f8fa82ea2ff17d0889c30becf92d (patch)
treec6fbb696d549d74098a0668dabdb3bff04a7858a /package/network/services/hostapd
parentc59eec158925b5c4f87d207c58ba3ce0c5214e9e (diff)
downloadupstream-e6a85bcd9a97f8fa82ea2ff17d0889c30becf92d.tar.gz
upstream-e6a85bcd9a97f8fa82ea2ff17d0889c30becf92d.tar.bz2
upstream-e6a85bcd9a97f8fa82ea2ff17d0889c30becf92d.zip
wpa_supplicant: fix interface combination parsing issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39155 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/hostapd')
-rw-r--r--package/network/services/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch18
1 files changed, 18 insertions, 0 deletions
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;