diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-08-28 17:01:55 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:52 -0400 |
commit | 3aefaa3294193c931b20a574f718efee6baf27d4 (patch) | |
tree | 11e488c4edf67d0c279ab0aaf54d182d77bc301d /net/mac80211/tx.c | |
parent | f658eb90d065c2d76ab3f3eb676ebf53462e323b (diff) |
[MAC80211]: remove fake set_key() call
Remove adding a fake key with a NONE key algorithm for each
associated STA. If we have hardware with such TX filtering
we should probably extend the sta_table_notification()
callback with the sta information instead; the fact that
it's treated as a key for some atheros hardware shouldn't
bother the stack.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 684f928def93..d70140cbd66a 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -426,10 +426,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_txrx_data *tx) | |||
426 | static ieee80211_txrx_result | 426 | static ieee80211_txrx_result |
427 | ieee80211_tx_h_select_key(struct ieee80211_txrx_data *tx) | 427 | ieee80211_tx_h_select_key(struct ieee80211_txrx_data *tx) |
428 | { | 428 | { |
429 | if (tx->sta) | 429 | tx->u.tx.control->key_idx = HW_KEY_IDX_INVALID; |
430 | tx->u.tx.control->key_idx = tx->sta->key_idx_compression; | ||
431 | else | ||
432 | tx->u.tx.control->key_idx = HW_KEY_IDX_INVALID; | ||
433 | 430 | ||
434 | if (unlikely(tx->u.tx.control->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT)) | 431 | if (unlikely(tx->u.tx.control->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT)) |
435 | tx->key = NULL; | 432 | tx->key = NULL; |