Commit 17753748 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath: move ath_bcast_mac to common header 



This is used by both ath5k and ath9k to set the first bssid mask.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9ecdef4b

drivers/net/wireless/ath/ath.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 


#include <linux/skbuff.h>



static const u8 ath_bcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};



struct reg_dmn_pair_mapping {

	u16 regDmnEnum;

	u16 reg_5ghz_ctl;

drivers/net/wireless/ath/ath5k/attach.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc) 
	ath5k_hw_set_lladdr(ah, (u8[ETH_ALEN]){});



	/* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */

	memset(ah->ah_bssid, 0xff, ETH_ALEN);

	memcpy(ah->ah_bssid, ath_bcast_mac, ETH_ALEN);

	ath5k_hw_set_associd(ah, ah->ah_bssid, 0);

	ath5k_hw_set_opmode(ah);

drivers/net/wireless/ath/ath5k/base.c

+1 −1
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) 


	SET_IEEE80211_PERM_ADDR(hw, mac);

	/* All MAC address bits matter for ACKs */

	memset(sc->bssidmask, 0xff, ETH_ALEN);

	memcpy(sc->bssidmask, ath_bcast_mac, ETH_ALEN);

	ath5k_hw_set_bssid_mask(sc->ah, sc->bssidmask);



	regulatory->current_rd = ah->ah_capabilities.cap_eeprom.ee_regdomain;

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ struct ath_node; 


#define	ATH_TXQ_SETUP(sc, i)        ((sc)->tx.txqsetup & (1<<i))



static const u8 ath_bcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};



struct ath_config {

	u32 ath_aggr_prot;

	u16 txpowlimit;

drivers/net/wireless/ath/ath5k/pcu.c

+1 −1

File changed.

Contains only whitespace changes.