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

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
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
static const u8 ath_bcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
struct reg_dmn_pair_mapping { struct reg_dmn_pair_mapping {
u16 regDmnEnum; u16 regDmnEnum;
u16 reg_5ghz_ctl; u16 reg_5ghz_ctl;
......
...@@ -336,7 +336,7 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc) ...@@ -336,7 +336,7 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc)
ath5k_hw_set_lladdr(ah, (u8[ETH_ALEN]){}); ath5k_hw_set_lladdr(ah, (u8[ETH_ALEN]){});
/* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */ /* 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_associd(ah, ah->ah_bssid, 0);
ath5k_hw_set_opmode(ah); ath5k_hw_set_opmode(ah);
......
...@@ -815,7 +815,7 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) ...@@ -815,7 +815,7 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
SET_IEEE80211_PERM_ADDR(hw, mac); SET_IEEE80211_PERM_ADDR(hw, mac);
/* All MAC address bits matter for ACKs */ /* 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); ath5k_hw_set_bssid_mask(sc->ah, sc->bssidmask);
regulatory->current_rd = ah->ah_capabilities.cap_eeprom.ee_regdomain; regulatory->current_rd = ah->ah_capabilities.cap_eeprom.ee_regdomain;
......
...@@ -365,7 +365,7 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah, const u8 *bssid, u16 assoc_id) ...@@ -365,7 +365,7 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah, const u8 *bssid, u16 assoc_id)
* assuming only 4 bits for a mac address and for BSSIDs you can then have: * assuming only 4 bits for a mac address and for BSSIDs you can then have:
* *
* \ * \
* MAC: 0001 | * MAC: 0001 |
* BSSID-01: 0100 | --> Belongs to us * BSSID-01: 0100 | --> Belongs to us
* BSSID-02: 1001 | * BSSID-02: 1001 |
* / * /
......
...@@ -60,8 +60,6 @@ struct ath_node; ...@@ -60,8 +60,6 @@ struct ath_node;
#define ATH_TXQ_SETUP(sc, i) ((sc)->tx.txqsetup & (1<<i)) #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 { struct ath_config {
u32 ath_aggr_prot; u32 ath_aggr_prot;
u16 txpowlimit; u16 txpowlimit;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment