diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /net/mac80211 | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 306eadb01fc4..52e4554fdde7 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -1077,12 +1077,9 @@ ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx) | |||
| 1077 | if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) && | 1077 | if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) && |
| 1078 | (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA && | 1078 | (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA && |
| 1079 | (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC && | 1079 | (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC && |
| 1080 | (rx->key || rx->sdata->drop_unencrypted))) { | 1080 | (rx->key || rx->sdata->drop_unencrypted))) |
| 1081 | if (net_ratelimit()) | ||
| 1082 | printk(KERN_DEBUG "%s: RX non-WEP frame, but expected " | ||
| 1083 | "encryption\n", rx->dev->name); | ||
| 1084 | return -EACCES; | 1081 | return -EACCES; |
| 1085 | } | 1082 | |
| 1086 | return 0; | 1083 | return 0; |
| 1087 | } | 1084 | } |
| 1088 | 1085 | ||