Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 311621
b: refs/heads/master
c: 4b5ebcc
h: refs/heads/master
i:
  311619: 543a761
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed Jun 27, 2012
1 parent f33649f commit 55e41c6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7508b657967cf664b5aa0f6367d05016e7e3bc2a
refs/heads/master: 4b5ebccc40843104d980f0714bc86bfcd5568941
5 changes: 4 additions & 1 deletion trunk/net/mac80211/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -2455,7 +2455,7 @@ ieee80211_rx_h_action_return(struct ieee80211_rx_data *rx)
* frames that we didn't handle, including returning unknown
* ones. For all other modes we will return them to the sender,
* setting the 0x80 bit in the action category, as required by
* 802.11-2007 7.3.1.11.
* 802.11-2012 9.24.4.
* Newer versions of hostapd shall also use the management frame
* registration mechanisms, but older ones still use cooked
* monitor interfaces so push all frames there.
Expand All @@ -2465,6 +2465,9 @@ ieee80211_rx_h_action_return(struct ieee80211_rx_data *rx)
sdata->vif.type == NL80211_IFTYPE_AP_VLAN))
return RX_DROP_MONITOR;

if (is_multicast_ether_addr(mgmt->da))
return RX_DROP_MONITOR;

/* do not return rejected action frames */
if (mgmt->u.action.category & 0x80)
return RX_DROP_UNUSABLE;
Expand Down

0 comments on commit 55e41c6

Please sign in to comment.