mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
This commit is contained in:
commit
1e42198609
346 changed files with 8374 additions and 5833 deletions
|
|
@ -1077,12 +1077,9 @@ ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx)
|
|||
if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) &&
|
||||
(rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
|
||||
(rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC &&
|
||||
(rx->key || rx->sdata->drop_unencrypted))) {
|
||||
if (net_ratelimit())
|
||||
printk(KERN_DEBUG "%s: RX non-WEP frame, but expected "
|
||||
"encryption\n", rx->dev->name);
|
||||
(rx->key || rx->sdata->drop_unencrypted)))
|
||||
return -EACCES;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue