diff options
| author | Johannes Berg | 2015-06-16 16:10:30 +0200 |
|---|---|---|
| committer | Johannes Berg | 2015-07-17 15:37:54 +0200 |
| commit | 16bf948081d0ea0f6cdef54b79a0250d4b099970 (patch) | |
| tree | ff2d5d7365935190d6f8a7624c912f55cb2d2bd8 | |
| parent | mac80211: rename 'sta_inf' variable to more common 'sta' (diff) | |
| download | kernel-qcow2-linux-16bf948081d0ea0f6cdef54b79a0250d4b099970.tar.gz kernel-qcow2-linux-16bf948081d0ea0f6cdef54b79a0250d4b099970.tar.xz kernel-qcow2-linux-16bf948081d0ea0f6cdef54b79a0250d4b099970.zip | |
mac80211: remove sta_info.gtk_idx
This struct member is only assigned, never used otherwise;
remove it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/key.c | 1 | ||||
| -rw-r--r-- | net/mac80211/sta_info.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index b22df3a79a41..44388d6a1d8e 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c @@ -336,7 +336,6 @@ static void ieee80211_key_replace(struct ieee80211_sub_if_data *sdata, ieee80211_check_fast_xmit(sta); } else { rcu_assign_pointer(sta->gtk[idx], new); - sta->gtk_idx = idx; } } else { defunikey = old && diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 226f8ca47ad6..147464dbc455 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -283,7 +283,6 @@ struct ieee80211_fast_tx { * @ptk: peer keys negotiated with this station, if any * @ptk_idx: last installed peer key index * @gtk: group keys negotiated with this station, if any - * @gtk_idx: last installed group key index * @rate_ctrl: rate control algorithm reference * @rate_ctrl_lock: spinlock used to protect rate control data * (data inside the algorithm, so serializes calls there) @@ -381,7 +380,6 @@ struct sta_info { struct ieee80211_sub_if_data *sdata; struct ieee80211_key __rcu *gtk[NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS]; struct ieee80211_key __rcu *ptk[NUM_DEFAULT_KEYS]; - u8 gtk_idx; u8 ptk_idx; struct rate_control_ref *rate_ctrl; void *rate_ctrl_priv; |