leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MAC80211]: remove fake set_key() call

Browse Source 
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>
This commit is contained in:
Johannes Berg 2007-08-28 17:01:55 -04:00 committed by David S. Miller
parent f658eb90d0
commit 3aefaa3294
4 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/debugfs_sta.c
View File

@ -60,7 +60,6 @@ static const struct file_operations sta_ ##name## _ops = { \
STA_OPS(name)
STA_FILE(aid, aid, D);
STA_FILE(key_idx_compression, key_idx_compression, D);
STA_FILE(dev, dev->name, S);
STA_FILE(vlan_id, vlan_id, D);
STA_FILE(rx_packets, rx_packets, LU);

18
net/mac80211/sta_info.c
View File

@ -165,7 +165,6 @@ struct sta_info * sta_info_add(struct ieee80211_local *local,
local->ops->sta_table_notification(local_to_hw(local),
local->num_sta);
write_unlock_bh(&local->sta_lock);
sta->key_idx_compression = HW_KEY_IDX_INVALID;
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
printk(KERN_DEBUG "%s: Added STA " MAC_FMT "\n",
@ -226,23 +225,6 @@ void sta_info_free(struct sta_info *sta)
dev_kfree_skb(skb);
}
if (sta->key) {
if (local->ops->set_key) {
local->ops->set_key(local_to_hw(local),
DISABLE_KEY, sta->addr,
&sta->key->conf);
}
} else if (sta->key_idx_compression != HW_KEY_IDX_INVALID) {
struct ieee80211_key_conf conf;
memset(&conf, 0, sizeof(conf));
conf.hw_key_idx = sta->key_idx_compression;
conf.alg = ALG_NONE;
conf.flags |= IEEE80211_KEY_FORCE_SW_ENCRYPT;
local->ops->set_key(local_to_hw(local), DISABLE_KEY,
sta->addr, &conf);
sta->key_idx_compression = HW_KEY_IDX_INVALID;
}
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
printk(KERN_DEBUG "%s: Removed STA " MAC_FMT "\n",
local->mdev->name, MAC_ARG(sta->addr));

4
net/mac80211/sta_info.h
View File

@ -90,10 +90,6 @@ struct sta_info {
int channel_use;
int channel_use_raw;
int key_idx_compression; /* key table index for compression and TX
* filtering; used only if sta->key is not
* set */
int assoc_ap; /* whether this is an AP that we are
* associated with as a client */

5
net/mac80211/tx.c
View File

@ -426,10 +426,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_txrx_data *tx)
static ieee80211_txrx_result
ieee80211_tx_h_select_key(struct ieee80211_txrx_data *tx)
{
if (tx->sta)
tx->u.tx.control->key_idx = tx->sta->key_idx_compression;
else
tx->u.tx.control->key_idx = HW_KEY_IDX_INVALID;
tx->u.tx.control->key_idx = HW_KEY_IDX_INVALID;
if (unlikely(tx->u.tx.control->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT))
tx->key = NULL;