summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00mac.c
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2011-03-03 19:44:53 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-03-04 20:06:48 +0100
commit567108ebd352f21640c536ea3b39584f9e7c28f8 (patch)
tree32df58f24b62240cd6c7ca5df440b8db944dd3a6 /drivers/net/wireless/rt2x00/rt2x00mac.c
parentrt2x00: Fix rt2800 key assignment in multi bssid setups (diff)
downloadlinux-567108ebd352f21640c536ea3b39584f9e7c28f8.tar.xz
linux-567108ebd352f21640c536ea3b39584f9e7c28f8.zip
rt2x00: Remove now unused crypto.aid field
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00mac.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00mac.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index aeee6e920d98..778b6d9cd686 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -518,11 +518,9 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
crypto.cmd = cmd;
- if (sta) {
- /* some drivers need the AID */
- crypto.aid = sta->aid;
+ if (sta)
crypto.address = sta->addr;
- } else
+ else
crypto.address = bcast_addr;
if (crypto.cipher == CIPHER_TKIP)