diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-20 16:44:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-20 16:44:04 -0700 |
| commit | 08322284c1620f01f0ece9907b6125be877e247b (patch) | |
| tree | 5068b7a970e6d332a83aa5f11e39330d3ddd825b /net/mac80211/util.c | |
| parent | c9ad20573a91ecfce45404bd0e33913b476613c5 (diff) | |
| parent | 010bfbe768f7ecc876ffba92db30432de4997e2a (diff) | |
Merge tag 'mac80211-next-for-net-next-2021-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Another set of updates, all over the map:
* set sk_pacing_shift for 802.3->802.11 encap offload
* some monitor support for 802.11->802.3 decap offload
* HE (802.11ax) spec updates
* userspace API for TDLS HE support
* along with various other small features, cleanups and
fixups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index c0fa526a45b4..0a0481f5af48 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -888,18 +888,10 @@ EXPORT_SYMBOL_GPL(wdev_to_ieee80211_vif); struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif) { - struct ieee80211_sub_if_data *sdata; - if (!vif) return NULL; - sdata = vif_to_sdata(vif); - - if (!ieee80211_sdata_running(sdata) || - !(sdata->flags & IEEE80211_SDATA_IN_DRIVER)) - return NULL; - - return &sdata->wdev; + return &vif_to_sdata(vif)->wdev; } EXPORT_SYMBOL_GPL(ieee80211_vif_to_wdev); |