diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2008-08-14 03:57:16 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-29 16:24:04 -0400 |
commit | ff9b662dab1fcd885fb728de3a8c13ebb5455117 (patch) | |
tree | f07e329f9a9f4f446f407318fd1694d3df84f6d9 /drivers/net/wireless/ath9k/beacon.c | |
parent | dc2222a85fd63103b9aad0d4b77c4d87b78c58a2 (diff) |
ath9k: Miscellaneous fixes
This patch removes ath_vap_listen() and dma wrapper macros.
Also, Inline abuse is cleaned up and a few typos are fixed.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/beacon.c')
-rw-r--r-- | drivers/net/wireless/ath9k/beacon.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c index a020f9a21544..89e5c65accd0 100644 --- a/drivers/net/wireless/ath9k/beacon.c +++ b/drivers/net/wireless/ath9k/beacon.c | |||
@@ -114,21 +114,21 @@ static void ath_beacon_setup(struct ath_softc *sc, | |||
114 | if (sc->sc_flags & SC_OP_PREAMBLE_SHORT) | 114 | if (sc->sc_flags & SC_OP_PREAMBLE_SHORT) |
115 | rate |= rt->info[rix].shortPreamble; | 115 | rate |= rt->info[rix].shortPreamble; |
116 | 116 | ||
117 | ath9k_hw_set11n_txdesc(ah, ds | 117 | ath9k_hw_set11n_txdesc(ah, ds, |
118 | , skb->len + FCS_LEN /* frame length */ | 118 | skb->len + FCS_LEN, /* frame length */ |
119 | , ATH9K_PKT_TYPE_BEACON /* Atheros packet type */ | 119 | ATH9K_PKT_TYPE_BEACON, /* Atheros packet type */ |
120 | , avp->av_btxctl.txpower /* txpower XXX */ | 120 | avp->av_btxctl.txpower, /* txpower XXX */ |
121 | , ATH9K_TXKEYIX_INVALID /* no encryption */ | 121 | ATH9K_TXKEYIX_INVALID, /* no encryption */ |
122 | , ATH9K_KEY_TYPE_CLEAR /* no encryption */ | 122 | ATH9K_KEY_TYPE_CLEAR, /* no encryption */ |
123 | , flags /* no ack, veol for beacons */ | 123 | flags /* no ack, veol for beacons */ |
124 | ); | 124 | ); |
125 | 125 | ||
126 | /* NB: beacon's BufLen must be a multiple of 4 bytes */ | 126 | /* NB: beacon's BufLen must be a multiple of 4 bytes */ |
127 | ath9k_hw_filltxdesc(ah, ds | 127 | ath9k_hw_filltxdesc(ah, ds, |
128 | , roundup(skb->len, 4) /* buffer length */ | 128 | roundup(skb->len, 4), /* buffer length */ |
129 | , true /* first segment */ | 129 | true, /* first segment */ |
130 | , true /* last segment */ | 130 | true, /* last segment */ |
131 | , ds /* first descriptor */ | 131 | ds /* first descriptor */ |
132 | ); | 132 | ); |
133 | 133 | ||
134 | memzero(series, sizeof(struct ath9k_11n_rate_series) * 4); | 134 | memzero(series, sizeof(struct ath9k_11n_rate_series) * 4); |
@@ -551,7 +551,7 @@ void ath_beacon_free(struct ath_softc *sc) | |||
551 | 551 | ||
552 | void ath9k_beacon_tasklet(unsigned long data) | 552 | void ath9k_beacon_tasklet(unsigned long data) |
553 | { | 553 | { |
554 | #define TSF_TO_TU(_h,_l) \ | 554 | #define TSF_TO_TU(_h,_l) \ |
555 | ((((u32)(_h)) << 22) | (((u32)(_l)) >> 10)) | 555 | ((((u32)(_h)) << 22) | (((u32)(_l)) >> 10)) |
556 | 556 | ||
557 | struct ath_softc *sc = (struct ath_softc *)data; | 557 | struct ath_softc *sc = (struct ath_softc *)data; |
@@ -898,19 +898,19 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) | |||
898 | "cfp:period %u " | 898 | "cfp:period %u " |
899 | "maxdur %u " | 899 | "maxdur %u " |
900 | "next %u " | 900 | "next %u " |
901 | "timoffset %u\n" | 901 | "timoffset %u\n", |
902 | , __func__ | 902 | __func__, |
903 | , (unsigned long long)tsf, tsftu | 903 | (unsigned long long)tsf, tsftu, |
904 | , bs.bs_intval | 904 | bs.bs_intval, |
905 | , bs.bs_nexttbtt | 905 | bs.bs_nexttbtt, |
906 | , bs.bs_dtimperiod | 906 | bs.bs_dtimperiod, |
907 | , bs.bs_nextdtim | 907 | bs.bs_nextdtim, |
908 | , bs.bs_bmissthreshold | 908 | bs.bs_bmissthreshold, |
909 | , bs.bs_sleepduration | 909 | bs.bs_sleepduration, |
910 | , bs.bs_cfpperiod | 910 | bs.bs_cfpperiod, |
911 | , bs.bs_cfpmaxduration | 911 | bs.bs_cfpmaxduration, |
912 | , bs.bs_cfpnext | 912 | bs.bs_cfpnext, |
913 | , bs.bs_timoffset | 913 | bs.bs_timoffset |
914 | ); | 914 | ); |
915 | 915 | ||
916 | ath9k_hw_set_interrupts(ah, 0); | 916 | ath9k_hw_set_interrupts(ah, 0); |