| Message ID | 1427444516-974-1-git-send-email-michal.kazior@tieto.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 27 March 2015 at 09:21, Michal Kazior <michal.kazior@tieto.com> wrote: > The variable should be cleared regardless of > whether there's a peer associated with the key or > not. > > This fixes case when user first associates with 2 > WEP keys and then disconnects and connects with 1 > WEP key. This resulted in WEP key count being 2 in > the driver leading to default keyidx fixup > failure. > > Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Tested-by: Bartosz Markowski <bartosz.markowski@tieto.com> > --- > drivers/net/wireless/ath/ath10k/mac.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c > index 9b8313dcb888..9d873900257d 100644 > --- a/drivers/net/wireless/ath/ath10k/mac.c > +++ b/drivers/net/wireless/ath/ath10k/mac.c > @@ -4101,6 +4101,13 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, > > key->hw_key_idx = key->keyidx; > > + if (is_wep) { > + if (cmd == SET_KEY) > + arvif->wep_keys[key->keyidx] = key; > + else > + arvif->wep_keys[key->keyidx] = NULL; > + } > + > /* the peer should not disappear in mid-way (unless FW goes awry) since > * we already hold conf_mutex. we just make sure its there now. */ > spin_lock_bh(&ar->data_lock); > @@ -4126,11 +4133,6 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, > flags |= WMI_KEY_GROUP; > > if (is_wep) { > - if (cmd == SET_KEY) > - arvif->wep_keys[key->keyidx] = key; > - else > - arvif->wep_keys[key->keyidx] = NULL; > - > if (cmd == DISABLE_KEY) > ath10k_clear_vdev_key(arvif, key); > > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Michal Kazior <michal.kazior@tieto.com> writes: > The variable should be cleared regardless of > whether there's a peer associated with the key or > not. > > This fixes case when user first associates with 2 > WEP keys and then disconnects and connects with 1 > WEP key. This resulted in WEP key count being 2 in > the driver leading to default keyidx fixup > failure. > > Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Thanks, both patches applied.
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 9b8313dcb888..9d873900257d 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -4101,6 +4101,13 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, key->hw_key_idx = key->keyidx; + if (is_wep) { + if (cmd == SET_KEY) + arvif->wep_keys[key->keyidx] = key; + else + arvif->wep_keys[key->keyidx] = NULL; + } + /* the peer should not disappear in mid-way (unless FW goes awry) since * we already hold conf_mutex. we just make sure its there now. */ spin_lock_bh(&ar->data_lock); @@ -4126,11 +4133,6 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, flags |= WMI_KEY_GROUP; if (is_wep) { - if (cmd == SET_KEY) - arvif->wep_keys[key->keyidx] = key; - else - arvif->wep_keys[key->keyidx] = NULL; - if (cmd == DISABLE_KEY) ath10k_clear_vdev_key(arvif, key);
The variable should be cleared regardless of whether there's a peer associated with the key or not. This fixes case when user first associates with 2 WEP keys and then disconnects and connects with 1 WEP key. This resulted in WEP key count being 2 in the driver leading to default keyidx fixup failure. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> --- drivers/net/wireless/ath/ath10k/mac.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)