diff options
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath9k/main.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index f05f584ab7bc..186d75acb326 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
@@ -362,7 +362,6 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc, | |||
362 | struct ieee80211_channel *curchan = hw->conf.channel; | 362 | struct ieee80211_channel *curchan = hw->conf.channel; |
363 | struct ath_vap *avp; | 363 | struct ath_vap *avp; |
364 | int pos; | 364 | int pos; |
365 | DECLARE_MAC_BUF(mac); | ||
366 | 365 | ||
367 | if (bss_conf->assoc) { | 366 | if (bss_conf->assoc) { |
368 | DPRINTF(sc, ATH_DBG_CONFIG, "%s: Bss Info ASSOC %d\n", | 367 | DPRINTF(sc, ATH_DBG_CONFIG, "%s: Bss Info ASSOC %d\n", |
@@ -397,9 +396,9 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc, | |||
397 | ath_update_chainmask(sc, bss_conf->assoc_ht); | 396 | ath_update_chainmask(sc, bss_conf->assoc_ht); |
398 | 397 | ||
399 | DPRINTF(sc, ATH_DBG_CONFIG, | 398 | DPRINTF(sc, ATH_DBG_CONFIG, |
400 | "%s: bssid %s aid 0x%x\n", | 399 | "%s: bssid %pM aid 0x%x\n", |
401 | __func__, | 400 | __func__, |
402 | print_mac(mac, sc->sc_curbssid), sc->sc_curaid); | 401 | sc->sc_curbssid, sc->sc_curaid); |
403 | 402 | ||
404 | DPRINTF(sc, ATH_DBG_CONFIG, "%s: Set channel: %d MHz\n", | 403 | DPRINTF(sc, ATH_DBG_CONFIG, "%s: Set channel: %d MHz\n", |
405 | __func__, | 404 | __func__, |
@@ -1278,7 +1277,6 @@ static int ath9k_config_interface(struct ieee80211_hw *hw, | |||
1278 | struct ath_vap *avp; | 1277 | struct ath_vap *avp; |
1279 | u32 rfilt = 0; | 1278 | u32 rfilt = 0; |
1280 | int error, i; | 1279 | int error, i; |
1281 | DECLARE_MAC_BUF(mac); | ||
1282 | 1280 | ||
1283 | avp = sc->sc_vaps[0]; | 1281 | avp = sc->sc_vaps[0]; |
1284 | if (avp == NULL) { | 1282 | if (avp == NULL) { |
@@ -1333,9 +1331,9 @@ static int ath9k_config_interface(struct ieee80211_hw *hw, | |||
1333 | sc->sc_imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS); | 1331 | sc->sc_imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS); |
1334 | 1332 | ||
1335 | DPRINTF(sc, ATH_DBG_CONFIG, | 1333 | DPRINTF(sc, ATH_DBG_CONFIG, |
1336 | "%s: RX filter 0x%x bssid %s aid 0x%x\n", | 1334 | "%s: RX filter 0x%x bssid %pM aid 0x%x\n", |
1337 | __func__, rfilt, | 1335 | __func__, rfilt, |
1338 | print_mac(mac, sc->sc_curbssid), sc->sc_curaid); | 1336 | sc->sc_curbssid, sc->sc_curaid); |
1339 | 1337 | ||
1340 | /* need to reconfigure the beacon */ | 1338 | /* need to reconfigure the beacon */ |
1341 | sc->sc_flags &= ~SC_OP_BEACONS ; | 1339 | sc->sc_flags &= ~SC_OP_BEACONS ; |
@@ -1424,7 +1422,6 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw, | |||
1424 | struct ath_softc *sc = hw->priv; | 1422 | struct ath_softc *sc = hw->priv; |
1425 | struct ath_node *an; | 1423 | struct ath_node *an; |
1426 | unsigned long flags; | 1424 | unsigned long flags; |
1427 | DECLARE_MAC_BUF(mac); | ||
1428 | 1425 | ||
1429 | spin_lock_irqsave(&sc->node_lock, flags); | 1426 | spin_lock_irqsave(&sc->node_lock, flags); |
1430 | an = ath_node_find(sc, sta->addr); | 1427 | an = ath_node_find(sc, sta->addr); |
@@ -1435,8 +1432,8 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw, | |||
1435 | spin_lock_irqsave(&sc->node_lock, flags); | 1432 | spin_lock_irqsave(&sc->node_lock, flags); |
1436 | if (!an) { | 1433 | if (!an) { |
1437 | ath_node_attach(sc, sta->addr, 0); | 1434 | ath_node_attach(sc, sta->addr, 0); |
1438 | DPRINTF(sc, ATH_DBG_CONFIG, "%s: Attach a node: %s\n", | 1435 | DPRINTF(sc, ATH_DBG_CONFIG, "%s: Attach a node: %pM\n", |
1439 | __func__, print_mac(mac, sta->addr)); | 1436 | __func__, sta->addr); |
1440 | } else { | 1437 | } else { |
1441 | ath_node_get(sc, sta->addr); | 1438 | ath_node_get(sc, sta->addr); |
1442 | } | 1439 | } |
@@ -1449,9 +1446,9 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw, | |||
1449 | __func__); | 1446 | __func__); |
1450 | else { | 1447 | else { |
1451 | ath_node_put(sc, an, ATH9K_BH_STATUS_INTACT); | 1448 | ath_node_put(sc, an, ATH9K_BH_STATUS_INTACT); |
1452 | DPRINTF(sc, ATH_DBG_CONFIG, "%s: Put a node: %s\n", | 1449 | DPRINTF(sc, ATH_DBG_CONFIG, "%s: Put a node: %pM\n", |
1453 | __func__, | 1450 | __func__, |
1454 | print_mac(mac, sta->addr)); | 1451 | sta->addr); |
1455 | } | 1452 | } |
1456 | break; | 1453 | break; |
1457 | default: | 1454 | default: |