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>

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 81a0f8bed6ae89a0b3948c0281b7574dc47947dc..c28ee07fad9f07e38bd8cd91b31fdd38c421dda4 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -467,7 +467,6 @@ struct rt2x00lib_crypto {
        const u8 *address;
 
        u32 bssidx;
-       u32 aid;
 
        u8 key[16];
        u8 tx_mic[8];

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index aeee6e920d987925d4d873c325019e4b36b4c570..778b6d9cd686727e7708d23d2767a54314e858ce 100644 (file)
--- 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)