提交 acaf908d 编写于 作者: I Ivo van Doorn 提交者: John W. Linville

rt2x00: Fix HW crypto key handling

When a crypto key is being removed, rt2x00mac should not
reset the key->hw_key_idx value because that will prevent
the driver from removing the correct key from the hardware.

Furthermore ffz() starts counting at 0 instead of 1, so we don't
need to substract 1 from the resulting value.
Signed-off-by: NStephen Blackheath <tramp.enshrine.stephen@blacksapphire.com>
Signed-off-by: NIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 4492bea6
...@@ -543,7 +543,8 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, ...@@ -543,7 +543,8 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
* provided but key 0 is not, then the key is not found * provided but key 0 is not, then the key is not found
* by the hardware during RX). * by the hardware during RX).
*/ */
key->hw_key_idx = 0; if (cmd == SET_KEY)
key->hw_key_idx = 0;
if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE)
set_key = rt2x00dev->ops->lib->config_pairwise_key; set_key = rt2x00dev->ops->lib->config_pairwise_key;
......
...@@ -381,7 +381,7 @@ static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev, ...@@ -381,7 +381,7 @@ static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev,
if (reg && reg == mask) if (reg && reg == mask)
return -ENOSPC; return -ENOSPC;
key->hw_key_idx += reg ? (ffz(reg) - 1) : 0; key->hw_key_idx += reg ? ffz(reg) : 0;
/* /*
* Upload key to hardware * Upload key to hardware
...@@ -477,7 +477,7 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev, ...@@ -477,7 +477,7 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
return -ENOSPC; return -ENOSPC;
} }
key->hw_key_idx += reg ? (ffz(reg) - 1) : 0; key->hw_key_idx += reg ? ffz(reg) : 0;
/* /*
* Upload key to hardware * Upload key to hardware
......
...@@ -393,7 +393,7 @@ static int rt73usb_config_shared_key(struct rt2x00_dev *rt2x00dev, ...@@ -393,7 +393,7 @@ static int rt73usb_config_shared_key(struct rt2x00_dev *rt2x00dev,
if (reg && reg == mask) if (reg && reg == mask)
return -ENOSPC; return -ENOSPC;
key->hw_key_idx += reg ? (ffz(reg) - 1) : 0; key->hw_key_idx += reg ? ffz(reg) : 0;
/* /*
* Upload key to hardware * Upload key to hardware
...@@ -494,7 +494,7 @@ static int rt73usb_config_pairwise_key(struct rt2x00_dev *rt2x00dev, ...@@ -494,7 +494,7 @@ static int rt73usb_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
return -ENOSPC; return -ENOSPC;
} }
key->hw_key_idx += reg ? (ffz(reg) - 1) : 0; key->hw_key_idx += reg ? ffz(reg) : 0;
/* /*
* Upload key to hardware * Upload key to hardware
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册