diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-19 15:58:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 15:58:41 -0500 |
| commit | 031cf0e94c9c8302a4592707939d6c2039f17f28 (patch) | |
| tree | 02f3f0d3f89f03217bdb83530af30a95c9ab6191 /net/mac80211/rx.c | |
| parent | 730dd70549e0ec755dd55615ba5cfc38a482a947 (diff) | |
| parent | ad580db50ee8dccd069ffcd76d6f70fa6d4a62a8 (diff) | |
| download | kernel_samsung_aries-031cf0e94c9c8302a4592707939d6c2039f17f28.zip kernel_samsung_aries-031cf0e94c9c8302a4592707939d6c2039f17f28.tar.gz kernel_samsung_aries-031cf0e94c9c8302a4592707939d6c2039f17f28.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index efa6d36..a8e15b8 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1946,6 +1946,10 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) } break; default: + /* do not process rejected action frames */ + if (mgmt->u.action.category & 0x80) + return RX_DROP_MONITOR; + return RX_CONTINUE; } |