diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-02-24 12:19:12 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-02-24 12:22:02 +0300 |
| commit | 8d74a623cc3cecda89da628b8f3d115d8cf1ee8f (patch) | |
| tree | 069dfaa1902d20ddf87b48db64972f900f157513 /net/wireless/rdev-ops.h | |
| parent | 8079e4fee5639cc01374cc2d2ea3f952598896b4 (diff) | |
| download | linux-8d74a623cc3cecda89da628b8f3d115d8cf1ee8f.tar.xz | |
Revert "nl80211: add src and dst addr attributes for control port tx/rx"
This reverts commit 8c3ed7aa2b9ef666195b789e9b02e28383243fa8.
As Jouni points out, there's really no need for this, since the
RSN pre-authentication frames are normal data frames, not port
control frames (locally).
We can still revert this now since it hasn't actually gone beyond
-next.
Fixes: 8c3ed7aa2b9e ("nl80211: add src and dst addr attributes for control port tx/rx")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20200224101910.b746e263287a.I9eb15d6895515179d50964dec3550c9dc784bb93@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/rdev-ops.h')
| -rw-r--r-- | net/wireless/rdev-ops.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h index 5ea34c1b60fe..e0d34f796d0b 100644 --- a/net/wireless/rdev-ops.h +++ b/net/wireless/rdev-ops.h @@ -734,14 +734,14 @@ static inline int rdev_mgmt_tx(struct cfg80211_registered_device *rdev, static inline int rdev_tx_control_port(struct cfg80211_registered_device *rdev, struct net_device *dev, const void *buf, size_t len, - const u8 *dest, const u8 *src, - __be16 proto, const bool noencrypt) + const u8 *dest, __be16 proto, + const bool noencrypt) { int ret; trace_rdev_tx_control_port(&rdev->wiphy, dev, buf, len, - dest, src, proto, noencrypt); + dest, proto, noencrypt); ret = rdev->ops->tx_control_port(&rdev->wiphy, dev, buf, len, - dest, src, proto, noencrypt); + dest, proto, noencrypt); trace_rdev_return_int(&rdev->wiphy, ret); return ret; } |