diff options
author | John Daiker <daikerjohn@gmail.com> | 2008-10-17 15:16:00 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:40 -0400 |
commit | 0bbac08f0a23898787978c0b405474e453e9824c (patch) | |
tree | d4931a377703853406e2328c612062439c73e19c /drivers/net/wireless/ath5k/base.c | |
parent | 93da9cc17c5ae8a751886fd4732db89ad5e9bdb9 (diff) |
ath5k: reduce checkpatch.pl errors
A few changes to reduce checkpatch.pl errors in the ath5k driver. For
the most part, I only fixed cosmetic things, and left the actual 'code
flow' untouched (hopefully)!
Diff is against wireless-testing HEAD.
Signed-off-by: John Daiker <daikerjohn@gmail.com>
Reviewed-by: Bob Copeland <me@bobcopeland.com>
Acked-by: Nick Kossifidis <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath5k/base.c')
-rw-r--r-- | drivers/net/wireless/ath5k/base.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 3773d983ea66..6caabebc4c66 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
@@ -2528,8 +2528,7 @@ ath5k_register_led(struct ath5k_softc *sc, struct ath5k_led *led, | |||
2528 | led->led_dev.brightness_set = ath5k_led_brightness_set; | 2528 | led->led_dev.brightness_set = ath5k_led_brightness_set; |
2529 | 2529 | ||
2530 | err = led_classdev_register(&sc->pdev->dev, &led->led_dev); | 2530 | err = led_classdev_register(&sc->pdev->dev, &led->led_dev); |
2531 | if (err) | 2531 | if (err) { |
2532 | { | ||
2533 | ATH5K_WARN(sc, "could not register LED %s\n", name); | 2532 | ATH5K_WARN(sc, "could not register LED %s\n", name); |
2534 | led->sc = NULL; | 2533 | led->sc = NULL; |
2535 | } | 2534 | } |
@@ -2890,9 +2889,9 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw, | |||
2890 | if (*new_flags & FIF_PROMISC_IN_BSS) { | 2889 | if (*new_flags & FIF_PROMISC_IN_BSS) { |
2891 | rfilt |= AR5K_RX_FILTER_PROM; | 2890 | rfilt |= AR5K_RX_FILTER_PROM; |
2892 | __set_bit(ATH_STAT_PROMISC, sc->status); | 2891 | __set_bit(ATH_STAT_PROMISC, sc->status); |
2893 | } | 2892 | } else { |
2894 | else | ||
2895 | __clear_bit(ATH_STAT_PROMISC, sc->status); | 2893 | __clear_bit(ATH_STAT_PROMISC, sc->status); |
2894 | } | ||
2896 | } | 2895 | } |
2897 | 2896 | ||
2898 | /* Note, AR5K_RX_FILTER_MCAST is already enabled */ | 2897 | /* Note, AR5K_RX_FILTER_MCAST is already enabled */ |
@@ -2956,7 +2955,7 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw, | |||
2956 | AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM; | 2955 | AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM; |
2957 | 2956 | ||
2958 | /* Set filters */ | 2957 | /* Set filters */ |
2959 | ath5k_hw_set_rx_filter(ah,rfilt); | 2958 | ath5k_hw_set_rx_filter(ah, rfilt); |
2960 | 2959 | ||
2961 | /* Set multicast bits */ | 2960 | /* Set multicast bits */ |
2962 | ath5k_hw_set_mcast_filter(ah, mfilt[0], mfilt[1]); | 2961 | ath5k_hw_set_mcast_filter(ah, mfilt[0], mfilt[1]); |
@@ -2973,7 +2972,7 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
2973 | struct ath5k_softc *sc = hw->priv; | 2972 | struct ath5k_softc *sc = hw->priv; |
2974 | int ret = 0; | 2973 | int ret = 0; |
2975 | 2974 | ||
2976 | switch(key->alg) { | 2975 | switch (key->alg) { |
2977 | case ALG_WEP: | 2976 | case ALG_WEP: |
2978 | /* XXX: fix hardware encryption, its not working. For now | 2977 | /* XXX: fix hardware encryption, its not working. For now |
2979 | * allow software encryption */ | 2978 | * allow software encryption */ |