diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-24 15:31:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-24 15:31:39 -0400 |
| commit | 029c58178b9aa0a293a86ee0da3355611ac99d07 (patch) | |
| tree | ce9476955fc61467a542211760ed1764343ddd2e /net/mac80211 | |
| parent | 0ff50e83b5122e836ca492fefb11656b225ac29c (diff) | |
| parent | 1b57b6210f4e52904393be97c62122aae69bc8aa (diff) | |
Merge tag 'mac80211-for-davem-2017-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just two fixes this time:
* fix the scheduled scan "BUG: scheduling while atomic"
* check mesh address extension flags more strictly
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 35f4c7d7a500..1f75280ba26c 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2492,7 +2492,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) if (is_multicast_ether_addr(hdr->addr1)) { mpp_addr = hdr->addr3; proxied_addr = mesh_hdr->eaddr1; - } else if (mesh_hdr->flags & MESH_FLAGS_AE_A5_A6) { + } else if ((mesh_hdr->flags & MESH_FLAGS_AE) == + MESH_FLAGS_AE_A5_A6) { /* has_a4 already checked in ieee80211_rx_mesh_check */ mpp_addr = hdr->addr4; proxied_addr = mesh_hdr->eaddr2; |