ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

mac80211: update WDS/4addr fix to the version accepted upstream

Browse Source 
This updates "{nl,mac}80211: allow 4addr AP operation on crypto
controlled devices" to the version (v3), which was accepted into
upstream mac80211.git and which is tagged for -stable backporting
(v4.18+).

https://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git/commit/?id=33d915d9e8ce811d8958915ccd18d71a66c7c495

Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
[format-patch]
This commit is contained in:
Stefan Lippers-Hollmann 2019-06-15 06:35:06 +02:00 committed by Christian Lamparter
parent c4fb221376
commit 5691665361
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch
View File

@ -1,12 +1,12 @@
From 3ad31f4efe9674a8bda057c79995a9468281e77f Mon Sep 17 00:00:00 2001 From 33d915d9e8ce811d8958915ccd18d71a66c7c495 Mon Sep 17 00:00:00 2001
From: Manikanta Pubbisetty <mpubbise@codeaurora.org> From: Manikanta Pubbisetty <mpubbise@codeaurora.org>
Date: Wed, 21 Nov 2018 16:33:48 +0530 Date: Wed, 8 May 2019 14:55:33 +0530
Subject: [PATCH] {nl,mac}80211: allow 4addr AP operation on crypto controlled Subject: [PATCH] {nl,mac}80211: allow 4addr AP operation on crypto controlled
devices devices
As per the current design, for sw crypto controlled devices, it is As per the current design, in the case of sw crypto controlled devices,
the device which has to advertise the support for AP/VLAN iftype it is the device which advertises the support for AP/VLAN iftype based
based on it's capability to tranmsit packets encrypted in software on it's ability to tranmsit packets encrypted in software
(In VLAN functionality, group traffic generated for a specific (In VLAN functionality, group traffic generated for a specific
VLAN group is always encrypted in software). Commit db3bdcb9c3ff VLAN group is always encrypted in software). Commit db3bdcb9c3ff
("mac80211: allow AP_VLAN operation on crypto controlled devices") ("mac80211: allow AP_VLAN operation on crypto controlled devices")
@ -16,25 +16,25 @@ Since 4addr AP operation also uses AP/VLAN iftype, this conditional
way of advertising AP/VLAN support has broken 4addr AP mode operation on way of advertising AP/VLAN support has broken 4addr AP mode operation on
crypto controlled devices which do not support VLAN functionality. crypto controlled devices which do not support VLAN functionality.
For example:
In the case of ath10k driver, not all firmwares have support for VLAN In the case of ath10k driver, not all firmwares have support for VLAN
functionality but all can support 4addr AP operation. Because AP/VLAN functionality but all can support 4addr AP operation. Because AP/VLAN
support is not advertised for these devices, 4addr AP operations are support is not advertised for these devices, 4addr AP operations are
also blocked. also blocked.
Fix this by allowing 4addr opertion on devices which do not advertise Fix this by allowing 4addr operation on devices which do not support
AP/VLAN iftype but which can support 4addr operation (the desicion is AP/VLAN iftype but can support 4addr AP operation (decision is based on
taken based on the wiphy flag WIPHY_FLAG_4ADDR_AP). the wiphy flag WIPHY_FLAG_4ADDR_AP).
Fixes: Commit db3bdcb9c3ff ("mac80211: allow AP_VLAN operation on Cc: stable@vger.kernel.org
crypto controlled devices") Fixes: db3bdcb9c3ff ("mac80211: allow AP_VLAN operation on crypto controlled devices")
Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org> Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
--- ---
include/net/cfg80211.h | 3 ++- include/net/cfg80211.h | 3 ++-
net/mac80211/util.c | 4 +++- net/mac80211/util.c | 4 +++-
net/wireless/core.c | 9 +++++++-- net/wireless/core.c | 6 +++++-
net/wireless/nl80211.c | 10 ++++++++-- net/wireless/nl80211.c | 8 ++++++--
4 files changed, 20 insertions(+), 6 deletions(-) 4 files changed, 16 insertions(+), 5 deletions(-)
--- a/include/net/cfg80211.h --- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h +++ b/include/net/cfg80211.h
@ -63,18 +63,16 @@ Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
return 0; return 0;
--- a/net/wireless/core.c --- a/net/wireless/core.c
+++ b/net/wireless/core.c +++ b/net/wireless/core.c
@@ -1351,8 +1351,13 @@ static int cfg80211_netdev_notifier_call @@ -1351,8 +1351,12 @@ static int cfg80211_netdev_notifier_call
} }
break; break;
case NETDEV_PRE_UP: case NETDEV_PRE_UP:
- if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype))) - if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype)))
- return notifier_from_errno(-EOPNOTSUPP); + if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype)) &&
+ if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype))) { + !(wdev->iftype == NL80211_IFTYPE_AP_VLAN &&
+ if (!(wdev->iftype == NL80211_IFTYPE_AP_VLAN && + rdev->wiphy.flags & WIPHY_FLAG_4ADDR_AP &&
+ rdev->wiphy.flags & WIPHY_FLAG_4ADDR_AP && + wdev->use_4addr))
+ wdev->use_4addr)) return notifier_from_errno(-EOPNOTSUPP);
+ return notifier_from_errno(-EOPNOTSUPP);
+ }
+ +
if (rfkill_blocked(rdev->rfkill)) if (rfkill_blocked(rdev->rfkill))
return notifier_from_errno(-ERFKILL); return notifier_from_errno(-ERFKILL);
@ -91,16 +89,14 @@ Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
return -EOPNOTSUPP; return -EOPNOTSUPP;
if ((type == NL80211_IFTYPE_P2P_DEVICE || type == NL80211_IFTYPE_NAN || if ((type == NL80211_IFTYPE_P2P_DEVICE || type == NL80211_IFTYPE_NAN ||
@@ -3214,6 +3213,13 @@ static int nl80211_new_interface(struct @@ -3214,6 +3213,11 @@ static int nl80211_new_interface(struct
return err; return err;
} }
+ if (!(rdev->wiphy.interface_modes & (1 << type))) { + if (!(rdev->wiphy.interface_modes & (1 << type)) &&
+ if (!(type == NL80211_IFTYPE_AP_VLAN && + !(type == NL80211_IFTYPE_AP_VLAN && params.use_4addr &&
+ rdev->wiphy.flags & WIPHY_FLAG_4ADDR_AP && + rdev->wiphy.flags & WIPHY_FLAG_4ADDR_AP))
+ params.use_4addr)) + return -EOPNOTSUPP;
+ return -EOPNOTSUPP;
+ }
+ +
err = nl80211_parse_mon_options(rdev, type, info, &params); err = nl80211_parse_mon_options(rdev, type, info, &params);
if (err < 0) if (err < 0)