mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
mac80211: remove key TX/RX counter
This counter is inherently racy (since it can be incremented by RX as well as by concurrent TX) and only available in debugfs. Instead of fixing it to be per-CPU or similar, remove it for now. If needed it should be added without races and with proper nl80211, perhaps even addressing the threshold reporting TODO item that's been there since the code was originally added. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
0c028b5fd1
commit
77c96404a4
@ -57,7 +57,6 @@ KEY_CONF_FILE(keylen, D);
|
||||
KEY_CONF_FILE(keyidx, D);
|
||||
KEY_CONF_FILE(hw_key_idx, D);
|
||||
KEY_FILE(flags, X);
|
||||
KEY_FILE(tx_rx_count, D);
|
||||
KEY_READ(ifindex, sdata->name, "%s\n");
|
||||
KEY_OPS(ifindex);
|
||||
|
||||
@ -310,7 +309,6 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key)
|
||||
DEBUGFS_ADD(flags);
|
||||
DEBUGFS_ADD(keyidx);
|
||||
DEBUGFS_ADD(hw_key_idx);
|
||||
DEBUGFS_ADD(tx_rx_count);
|
||||
DEBUGFS_ADD(algorithm);
|
||||
DEBUGFS_ADD(tx_spec);
|
||||
DEBUGFS_ADD(rx_spec);
|
||||
|
@ -115,9 +115,6 @@ struct ieee80211_key {
|
||||
} gen;
|
||||
} u;
|
||||
|
||||
/* number of times this key has been used */
|
||||
int tx_rx_count;
|
||||
|
||||
#ifdef CONFIG_MAC80211_DEBUGFS
|
||||
struct {
|
||||
struct dentry *stalink;
|
||||
|
@ -1682,7 +1682,6 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
|
||||
if (unlikely(rx->key->flags & KEY_FLAG_TAINTED))
|
||||
return RX_DROP_MONITOR;
|
||||
|
||||
rx->key->tx_rx_count++;
|
||||
/* TODO: add threshold stuff again */
|
||||
} else {
|
||||
return RX_DROP_MONITOR;
|
||||
|
@ -610,7 +610,6 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
|
||||
if (tx->key) {
|
||||
bool skip_hw = false;
|
||||
|
||||
tx->key->tx_rx_count++;
|
||||
/* TODO: add threshold stuff again */
|
||||
|
||||
switch (tx->key->conf.cipher) {
|
||||
|
Loading…
Reference in New Issue
Block a user