summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-03-30 20:48:43 -0700
committerDavid S. Miller <davem@davemloft.net>2020-03-30 20:48:43 -0700
commit5a470b1a63ac211e01a93de9d913753d64a21d9a (patch)
treec7b1c6914425e6e73fe25c282d610a34bdba7a24 /net/mac80211
parent3902baf9abfa320b21e38fe206d66d5e6688e721 (diff)
parent0141317611ab913d6c227b82f3dd02ff3e6fc5d8 (diff)
downloadlinux-5a470b1a63ac211e01a93de9d913753d64a21d9a.tar.gz
linux-5a470b1a63ac211e01a93de9d913753d64a21d9a.tar.bz2
linux-5a470b1a63ac211e01a93de9d913753d64a21d9a.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/tx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b65284f210c3..82846aca86d9 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3611,7 +3611,8 @@ begin:
* Drop unicast frames to unauthorised stations unless they are
* EAPOL frames from the local station.
*/
- if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) &&
+ if (unlikely(ieee80211_is_data(hdr->frame_control) &&
+ !ieee80211_vif_is_mesh(&tx.sdata->vif) &&
tx.sdata->vif.type != NL80211_IFTYPE_OCB &&
!is_multicast_ether_addr(hdr->addr1) &&
!test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&