diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-17 06:00:22 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-17 06:00:22 +0300 |
| commit | ddb535a6a04edf4b9053956ab3adc4f4eb7f945c (patch) | |
| tree | 72e3fcea2abe9d37bd81f397dd58f2567c409ace /net/wireless/rdev-ops.h | |
| parent | 1e5946f5f7fe9267c71097a83615a6e5eb0f4cfd (diff) | |
| parent | 1f6e0baa703d31002c312c3e423c108b04325df0 (diff) | |
| download | linux-ddb535a6a04edf4b9053956ab3adc4f4eb7f945c.tar.xz | |
Merge tag 'mac80211-next-for-net-next-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
A few big new things:
* 802.11 frame encapsulation offload support
* more HE (802.11ax) support, including some for 6 GHz band
* powersave in hwsim, for better testing
Of course as usual there are various cleanups and small fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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 e0d34f796d0b..5ea34c1b60fe 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, __be16 proto, - const bool noencrypt) + const u8 *dest, const u8 *src, + __be16 proto, const bool noencrypt) { int ret; trace_rdev_tx_control_port(&rdev->wiphy, dev, buf, len, - dest, proto, noencrypt); + dest, src, proto, noencrypt); ret = rdev->ops->tx_control_port(&rdev->wiphy, dev, buf, len, - dest, proto, noencrypt); + dest, src, proto, noencrypt); trace_rdev_return_int(&rdev->wiphy, ret); return ret; } |