aboutsummaryrefslogtreecommitdiffstats
path: root/package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-03-14 10:53:39 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-03-14 10:53:39 +0000
commit9b1e65073a8b1a571c390a1041bfe7fcd07d97ba (patch)
tree3fb5ee70c7729cd9b53221d8d8b2ac5106fa8f18 /package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch
parent37c1e30ba04ada85de79fc75b6a8d7f0b6cb8600 (diff)
downloadupstream-9b1e65073a8b1a571c390a1041bfe7fcd07d97ba.tar.gz
upstream-9b1e65073a8b1a571c390a1041bfe7fcd07d97ba.tar.bz2
upstream-9b1e65073a8b1a571c390a1041bfe7fcd07d97ba.zip
hostapd: backport package from trunk r39765
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@39927 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch')
-rw-r--r--package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch b/package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch
new file mode 100644
index 0000000000..fe72ee29c6
--- /dev/null
+++ b/package/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;