Просмотр исходного кода

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>
Helmut Schaa 14 лет назад
Родитель
Сommit
567108ebd3
2 измененных файлов с 2 добавлено и 5 удалено
  1. 0 1
      drivers/net/wireless/rt2x00/rt2x00.h
  2. 2 4
      drivers/net/wireless/rt2x00/rt2x00mac.c

+ 0 - 1
drivers/net/wireless/rt2x00/rt2x00.h

@@ -467,7 +467,6 @@ struct rt2x00lib_crypto {
 	const u8 *address;
 	const u8 *address;
 
 
 	u32 bssidx;
 	u32 bssidx;
-	u32 aid;
 
 
 	u8 key[16];
 	u8 key[16];
 	u8 tx_mic[8];
 	u8 tx_mic[8];

+ 2 - 4
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;
 	crypto.cmd = cmd;
 
 
-	if (sta) {
-		/* some drivers need the AID */
-		crypto.aid = sta->aid;
+	if (sta)
 		crypto.address = sta->addr;
 		crypto.address = sta->addr;
-	} else
+	else
 		crypto.address = bcast_addr;
 		crypto.address = bcast_addr;
 
 
 	if (crypto.cipher == CIPHER_TKIP)
 	if (crypto.cipher == CIPHER_TKIP)