redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

mac80211: remove sta_info.gtk_idx

Browse source 
This struct member is only assigned, never used otherwise;
remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2015-06-16 16:10:30 +02:00
parent cf47161ad2
commit 16bf948081
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net/mac80211/key.c
View file

@ -336,7 +336,6 @@ static void ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
ieee80211_check_fast_xmit(sta); ieee80211_check_fast_xmit(sta);
} else { } else {
rcu_assign_pointer(sta->gtk[idx], new); rcu_assign_pointer(sta->gtk[idx], new);
sta->gtk_idx = idx;
} }
} else { } else {
defunikey = old && defunikey = old &&

2
net/mac80211/sta_info.h
View file

@ -283,7 +283,6 @@ struct ieee80211_fast_tx {
* @ptk: peer keys negotiated with this station, if any * @ptk: peer keys negotiated with this station, if any
* @ptk_idx: last installed peer key index * @ptk_idx: last installed peer key index
* @gtk: group keys negotiated with this station, if any * @gtk: group keys negotiated with this station, if any
* @gtk_idx: last installed group key index
* @rate_ctrl: rate control algorithm reference * @rate_ctrl: rate control algorithm reference
* @rate_ctrl_lock: spinlock used to protect rate control data * @rate_ctrl_lock: spinlock used to protect rate control data
* (data inside the algorithm, so serializes calls there) * (data inside the algorithm, so serializes calls there)
@ -381,7 +380,6 @@ struct sta_info {
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
struct ieee80211_key __rcu *gtk[NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS]; struct ieee80211_key __rcu *gtk[NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS];
struct ieee80211_key __rcu *ptk[NUM_DEFAULT_KEYS]; struct ieee80211_key __rcu *ptk[NUM_DEFAULT_KEYS];
u8 gtk_idx;
u8 ptk_idx; u8 ptk_idx;
struct rate_control_ref *rate_ctrl; struct rate_control_ref *rate_ctrl;
void *rate_ctrl_priv; void *rate_ctrl_priv;