diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2011-03-03 19:44:53 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-03-04 14:06:48 -0500 |
| commit | 567108ebd352f21640c536ea3b39584f9e7c28f8 (patch) | |
| tree | 32df58f24b62240cd6c7ca5df440b8db944dd3a6 /drivers/net | |
| parent | 1ed3811c33d525be1c657261db1713f294c40c60 (diff) | |
| download | linux-stable-567108ebd352f21640c536ea3b39584f9e7c28f8.tar.gz linux-stable-567108ebd352f21640c536ea3b39584f9e7c28f8.tar.bz2 linux-stable-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')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 6 |
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 { 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 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) |