diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2008-08-25 22:40:29 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-29 16:24:09 -0400 |
commit | 822ceaefaaaea4bcd7965e3f4b3479e805f7dfa5 (patch) | |
tree | efe9023e6e78d07c97e86cc99cb2a360f0075567 /drivers/net/wireless | |
parent | c83be6885e2f1ee6e0b290b6cfc82014c675e087 (diff) |
ath9k: Remove more dead code
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath9k/ath9k.h | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/beacon.c | 25 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/hw.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/main.c | 5 |
4 files changed, 0 insertions, 39 deletions
diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h index 020b97fd208c..28b8d84f49b4 100644 --- a/drivers/net/wireless/ath9k/ath9k.h +++ b/drivers/net/wireless/ath9k/ath9k.h | |||
@@ -628,11 +628,6 @@ struct ath9k_country_entry { | |||
628 | (IEEE80211_WEP_IVLEN + \ | 628 | (IEEE80211_WEP_IVLEN + \ |
629 | IEEE80211_WEP_KIDLEN + \ | 629 | IEEE80211_WEP_KIDLEN + \ |
630 | IEEE80211_WEP_CRCLEN)) | 630 | IEEE80211_WEP_CRCLEN)) |
631 | #define IEEE80211_MAX_LEN (2300 + FCS_LEN + \ | ||
632 | (IEEE80211_WEP_IVLEN + \ | ||
633 | IEEE80211_WEP_KIDLEN + \ | ||
634 | IEEE80211_WEP_CRCLEN)) | ||
635 | |||
636 | #define MAX_RATE_POWER 63 | 631 | #define MAX_RATE_POWER 63 |
637 | 632 | ||
638 | enum ath9k_power_mode { | 633 | enum ath9k_power_mode { |
diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c index fdbabc180228..c43fd5861163 100644 --- a/drivers/net/wireless/ath9k/beacon.c +++ b/drivers/net/wireless/ath9k/beacon.c | |||
@@ -454,31 +454,6 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp) | |||
454 | } | 454 | } |
455 | 455 | ||
456 | /* | 456 | /* |
457 | * Reclaim beacon resources and return buffer to the pool. | ||
458 | * | ||
459 | * This function will free any wbuf frames that are still attached to the | ||
460 | * beacon buffers in the ATH object. Note that this does not de-allocate | ||
461 | * any wbuf objects that are in the transmit queue and have not yet returned | ||
462 | * to the ATH object. | ||
463 | */ | ||
464 | |||
465 | void ath_beacon_free(struct ath_softc *sc) | ||
466 | { | ||
467 | struct ath_buf *bf; | ||
468 | |||
469 | list_for_each_entry(bf, &sc->sc_bbuf, list) { | ||
470 | if (bf->bf_mpdu != NULL) { | ||
471 | struct sk_buff *skb = (struct sk_buff *) bf->bf_mpdu; | ||
472 | pci_unmap_single(sc->pdev, bf->bf_dmacontext, | ||
473 | skb_end_pointer(skb) - skb->head, | ||
474 | PCI_DMA_TODEVICE); | ||
475 | dev_kfree_skb_any(skb); | ||
476 | bf->bf_mpdu = NULL; | ||
477 | } | ||
478 | } | ||
479 | } | ||
480 | |||
481 | /* | ||
482 | * Tasklet for Sending Beacons | 457 | * Tasklet for Sending Beacons |
483 | * | 458 | * |
484 | * Transmit one or more beacon frames at SWBA. Dynamic updates to the frame | 459 | * Transmit one or more beacon frames at SWBA. Dynamic updates to the frame |
diff --git a/drivers/net/wireless/ath9k/hw.h b/drivers/net/wireless/ath9k/hw.h index 5cb3912ad392..2113818ee934 100644 --- a/drivers/net/wireless/ath9k/hw.h +++ b/drivers/net/wireless/ath9k/hw.h | |||
@@ -825,10 +825,6 @@ struct ath_hal_5416 { | |||
825 | #define COEF_SCALE_S 24 | 825 | #define COEF_SCALE_S 24 |
826 | #define HT40_CHANNEL_CENTER_SHIFT 10 | 826 | #define HT40_CHANNEL_CENTER_SHIFT 10 |
827 | 827 | ||
828 | #define ar5416CheckOpMode(_opmode) \ | ||
829 | ((_opmode == ATH9K_M_STA) || (_opmode == ATH9K_M_IBSS) || \ | ||
830 | (_opmode == ATH9K_M_HOSTAP) || (_opmode == ATH9K_M_MONITOR)) | ||
831 | |||
832 | #define AR5416_EEPROM_MAGIC_OFFSET 0x0 | 828 | #define AR5416_EEPROM_MAGIC_OFFSET 0x0 |
833 | 829 | ||
834 | #define AR5416_EEPROM_S 2 | 830 | #define AR5416_EEPROM_S 2 |
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 996bb9c6540d..dc45eef3289a 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
@@ -1167,11 +1167,6 @@ int ath_rx_subframe(struct ath_node *an, | |||
1167 | return 0; | 1167 | return 0; |
1168 | } | 1168 | } |
1169 | 1169 | ||
1170 | enum ath9k_ht_macmode ath_cwm_macmode(struct ath_softc *sc) | ||
1171 | { | ||
1172 | return sc->sc_ht_info.tx_chan_width; | ||
1173 | } | ||
1174 | |||
1175 | /********************************/ | 1170 | /********************************/ |
1176 | /* LED functions */ | 1171 | /* LED functions */ |
1177 | /********************************/ | 1172 | /********************************/ |