diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-16 02:15:00 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-16 02:15:00 (GMT) |
| commit | c4cbb34bbdaaa841ef7c027f7b420db4c318c4fd (patch) | |
| tree | 90f40954097eb686752e03ad7088bd9191345132 /net | |
| parent | 0517deed78be9cc9ce9799bf15da58fd0d2078bb (diff) | |
| parent | b358492cd2a9c67bff352c5a60d86e7fc9627477 (diff) | |
| download | linux-c4cbb34bbdaaa841ef7c027f7b420db4c318c4fd.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 7 | ||||
| -rw-r--r-- | net/rfkill/rfkill.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 535407d..a8a40ab 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1050,12 +1050,9 @@ ieee80211_drop_unencrypted(struct ieee80211_txrx_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; } diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 140a0a8..4e10a95 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c @@ -92,7 +92,7 @@ void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state) rfkill_states[type] = state; list_for_each_entry(rfkill, &rfkill_list, node) { - if (!rfkill->user_claim) + if ((!rfkill->user_claim) && (rfkill->type == type)) rfkill_toggle_radio(rfkill, state); } |