commit 57ba7c06221ec54c1c91f04582d71332879076c0 Author: Jiri Slaby Date: Tue Aug 7 08:19:20 2007 +0200 remove sp[ace on the line beginning diff --git a/ath5k.h b/ath5k.h index b57e16b..b679055 100644 --- a/ath5k.h +++ b/ath5k.h @@ -156,9 +156,9 @@ struct ath5k_srev_name { { "2112a", AR5K_VERSION_RAD, AR5K_SREV_RAD_2112A }, \ { "xxxx", AR5K_VERSION_RAD, AR5K_SREV_UNKNOWN }, \ { "2413", AR5K_VERSION_DEV, PCI_DEVICE_ID_ATHEROS_AR2413 },\ - { "5413", AR5K_VERSION_DEV, PCI_DEVICE_ID_ATHEROS_AR5413 },\ - { "5424", AR5K_VERSION_DEV, PCI_DEVICE_ID_ATHEROS_AR5424 },\ - { "xxxx", AR5K_VERSION_DEV, AR5K_SREV_UNKNOWN } \ + { "5413", AR5K_VERSION_DEV, PCI_DEVICE_ID_ATHEROS_AR5413 },\ + { "5424", AR5K_VERSION_DEV, PCI_DEVICE_ID_ATHEROS_AR5424 },\ + { "xxxx", AR5K_VERSION_DEV, AR5K_SREV_UNKNOWN } \ } #define AR5K_SREV_UNKNOWN 0xffff diff --git a/ath5k_base.c b/ath5k_base.c index 9af70e1..0d5281b 100644 --- a/ath5k_base.c +++ b/ath5k_base.c @@ -562,7 +562,7 @@ static void ath_beacon_send(struct ath_softc *sc) "%s: stuck beacon time (%u missed)\n", __func__, sc->bmisscount); tasklet_schedule(&sc->restq); - } + } return; } if (unlikely(sc->bmisscount != 0)) { diff --git a/ath5k_base.h b/ath5k_base.h index da20ef2..39ad8f9 100644 --- a/ath5k_base.h +++ b/ath5k_base.h @@ -80,8 +80,8 @@ #define ATH_LPF_RSSI(x, y, len) \ ((x != ATH_RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y)) #define ATH_RSSI_LPF(x, y) do { \ - if ((y) >= -20) \ - x = ATH_LPF_RSSI((x), ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN); \ + if ((y) >= -20) \ + x = ATH_LPF_RSSI((x), ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN); \ } while (0) struct ath_buf { diff --git a/ath5k_hw.c b/ath5k_hw.c index ba76103..def9b8f 100644 --- a/ath5k_hw.c +++ b/ath5k_hw.c @@ -123,7 +123,7 @@ static const struct ath5k_ini_rfgain ath5k_rfg[] = AR5K_INI_RFGAIN; */ static u16 /*TODO: Is this really hardware dependent ?*/ ath_hal_computetxtime(struct ath_hw *hal, const struct ath5k_rate_table *rates, - u32 frame_length, u16 rate_index, bool short_preamble) + u32 frame_length, u16 rate_index, bool short_preamble) { const struct ath5k_rate *rate; u32 value; @@ -403,8 +403,8 @@ struct ath_hw *ath5k_hw_attach(u16 device, u8 mac_version, void *sc, hal->ah_phy = AR5K_PHY(0); /* Set MAC to bcast: ff:ff:ff:ff:ff:ff, this is using 'mac' as a - * temporary variable for setting our BSSID. Right bellow we update - * it with ath5k_hw_get_lladdr() */ + * temporary variable for setting our BSSID. Right bellow we update + * it with ath5k_hw_get_lladdr() */ memset(mac, 0xff, ETH_ALEN); ath5k_hw_set_associd(hal, mac, 0); @@ -1096,7 +1096,7 @@ int ath5k_hw_reset(struct ath_hw *hal, enum ieee80211_if_types op_mode, if (hal->ah_version != AR5K_AR5210) { ath5k_hw_reg_write(hal, 0xffffffff, AR5K_PISR); /* XXX: AR5K_RSSI_THR has masks and shifts defined for it, so - * direct write using ath5k_hw_reg_write seems wrong. Test with: + * direct write using ath5k_hw_reg_write seems wrong. Test with: * AR5K_REG_WRITE_BITS(hal, AR5K_RSSI_THR, * AR5K_RSSI_THR_BMISS, AR5K_TUNE_RSSI_THRES); * with different variables and check results compared @@ -1153,8 +1153,8 @@ int ath5k_hw_reset(struct ath_hw *hal, enum ieee80211_if_types op_mode, } /* - * Enable noise floor calibration and wait until completion - */ + * Enable noise floor calibration and wait until completion + */ AR5K_REG_ENABLE_BITS(hal, AR5K_PHY_AGCCTL, AR5K_PHY_AGCCTL_NF); @@ -1668,7 +1668,7 @@ ath5k_hw_update_tx_triglevel(struct ath_hw *hal, bool increase) status = true; - done: +done: /* * Restore interrupt mask */ @@ -2651,8 +2651,7 @@ ath5k_hw_stop_pcu_recv(struct ath_hw *hal) * Set multicast filter */ void -ath5k_hw_set_mcast_filter(struct ath_hw *hal, u32 filter0, - u32 filter1) +ath5k_hw_set_mcast_filter(struct ath_hw *hal, u32 filter0, u32 filter1) { AR5K_TRACE; /* Set the multicat filter */ @@ -2849,7 +2848,7 @@ ath5k_hw_set_beacon_timers(struct ath_hw *hal, const struct ath5k_beacon_state * { u32 cfp_period, next_cfp, dtim, interval, next_beacon; - /* + /* * TODO: should be changed through *state * review struct ath5k_beacon_state struct * @@ -3204,7 +3203,7 @@ int ath5k_hw_set_key_lladdr(struct ath_hw *hal, u16 entry, const u8 *mac) AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE); /* MAC may be NULL if it's a broadcast key. In this case no need to - * to compute AR5K_LOW_ID and AR5K_HIGH_ID as we already know it. */ + * to compute AR5K_LOW_ID and AR5K_HIGH_ID as we already know it. */ if (unlikely(mac == NULL)) { low_id = 0xffffffff; high_id = 0xffff | AR5K_KEYTABLE_VALID; @@ -3820,8 +3819,8 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath_hw *hal, */ static bool ath5k_hw_setup_xr_tx_desc(struct ath_hw *hal, struct ath_desc *desc, - unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2, u_int tx_tries2, - unsigned int tx_rate3, u_int tx_tries3) + unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2, u_int tx_tries2, + unsigned int tx_rate3, u_int tx_tries3) { struct ath5k_hw_4w_tx_desc *tx_desc; @@ -4716,8 +4715,8 @@ static int ath5k_hw_rf5110_calibrate(struct ath_hw *hal, } /* - * Enable noise floor calibration and wait until completion - */ + * Enable noise floor calibration and wait until completion + */ AR5K_REG_ENABLE_BITS(hal, AR5K_PHY_AGCCTL, AR5K_PHY_AGCCTL_NF); ret = ath5k_hw_register_timeout(hal, AR5K_PHY_AGCCTL, @@ -5671,8 +5670,7 @@ ath5k_hw_query_pspoll_support(struct ath_hw *hal) } bool -ath5k_hw_enable_pspoll(struct ath_hw *hal, u8 *bssid, - u16 assoc_id) +ath5k_hw_enable_pspoll(struct ath_hw *hal, u8 *bssid, u16 assoc_id) { AR5K_TRACE; if (hal->ah_version == AR5K_AR5210) {