Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18325523 authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

rt2x00: Move bssidx calculation into its own function 



This will be used by a later patch. No functional changes.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1ea57b1f

drivers/net/wireless/rt2x00/rt2x00.h

+6 −0
Original line number Diff line number Diff line
@@ -1225,6 +1225,12 @@ static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, 
}

#endif /* CONFIG_RT2X00_LIB_DEBUGFS */



/*

 * Utility functions.

 */

u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,

			 struct ieee80211_vif *vif);



/*

 * Interrupt context handlers.

 */

drivers/net/wireless/rt2x00/rt2x00dev.c

+16 −0
Original line number Diff line number Diff line
@@ -32,6 +32,22 @@ 
#include "rt2x00.h"

#include "rt2x00lib.h"



/*

 * Utility functions.

 */

u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,

			 struct ieee80211_vif *vif)

{

	/*

	 * When in STA mode, bssidx is always 0 otherwise local_address[5]

	 * contains the bss number, see BSS_ID_MASK comments for details.

	 */

	if (rt2x00dev->intf_sta_count)

		return 0;

	return vif->addr[5] & (rt2x00dev->ops->max_ap_intf - 1);

}

EXPORT_SYMBOL_GPL(rt2x00lib_get_bssidx);



/*

 * Radio control handlers.

 */

drivers/net/wireless/rt2x00/rt2x00mac.c

+1 −9
Original line number Diff line number Diff line
@@ -504,15 +504,7 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 


	memset(&crypto, 0, sizeof(crypto));



	/*

	 * When in STA mode, bssidx is always 0 otherwise local_address[5]

	 * contains the bss number, see BSS_ID_MASK comments for details.

	 */

	if (rt2x00dev->intf_sta_count)

		crypto.bssidx = 0;

	else

		crypto.bssidx = vif->addr[5] & (rt2x00dev->ops->max_ap_intf - 1);



	crypto.bssidx = rt2x00lib_get_bssidx(rt2x00dev, vif);

	crypto.cipher = rt2x00crypto_key_to_cipher(key);

	if (crypto.cipher == CIPHER_NONE)

		return -EOPNOTSUPP;