aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2011-03-03 13:44:53 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-03-04 14:06:48 -0500
commit567108ebd352f21640c536ea3b39584f9e7c28f8 (patch)
tree32df58f24b62240cd6c7ca5df440b8db944dd3a6 /drivers
parent1ed3811c33d525be1c657261db1713f294c40c60 (diff)
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')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00.h1
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00mac.c6
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 81a0f8bed6ae..c28ee07fad9f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -467,7 +467,6 @@ struct rt2x00lib_crypto {
467 const u8 *address; 467 const u8 *address;
468 468
469 u32 bssidx; 469 u32 bssidx;
470 u32 aid;
471 470
472 u8 key[16]; 471 u8 key[16];
473 u8 tx_mic[8]; 472 u8 tx_mic[8];
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,
518 518
519 crypto.cmd = cmd; 519 crypto.cmd = cmd;
520 520
521 if (sta) { 521 if (sta)
522 /* some drivers need the AID */
523 crypto.aid = sta->aid;
524 crypto.address = sta->addr; 522 crypto.address = sta->addr;
525 } else 523 else
526 crypto.address = bcast_addr; 524 crypto.address = bcast_addr;
527 525
528 if (crypto.cipher == CIPHER_TKIP) 526 if (crypto.cipher == CIPHER_TKIP)