diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-15 08:51:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-15 08:51:13 -0700 |
| commit | 25009a1ae1171eda6bff44b7e44eb0e076713811 (patch) | |
| tree | 182491960c3f837d12880a2f94369c8ebd8d1fcd /net/mac80211/tx.c | |
| parent | 6864ddb2d3089739d29418a1ff52adb2fbf9c0ca (diff) | |
| parent | 95a943c162d74b20d869917bdf5df11293c35b63 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index e8d0d2d2266..8cb0d2d0ac6 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -589,6 +589,9 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx) break; } + if (unlikely(tx->key && tx->key->flags & KEY_FLAG_TAINTED)) + return TX_DROP; + if (!skip_hw && tx->key && tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) info->control.hw_key = &tx->key->conf; |