diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-22 19:54:12 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-22 19:54:12 +0200 |
commit | 8ceedea7c2600a1018d20f67e766c0773b59391a (patch) | |
tree | 596b2e9ceb312903d7437825dc45c9aa838ff71f /drivers | |
parent | hso: remove setting of low_latency flag (diff) | |
parent | ath5k: initialize ah->ah_current_channel (diff) | |
download | linux-8ceedea7c2600a1018d20f67e766c0773b59391a.tar.xz linux-8ceedea7c2600a1018d20f67e766c0773b59391a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/attach.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c index e0c244b02f05..31c008042bfe 100644 --- a/drivers/net/wireless/ath/ath5k/attach.c +++ b/drivers/net/wireless/ath/ath5k/attach.c @@ -126,6 +126,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc) ah->ah_ant_mode = AR5K_ANTMODE_DEFAULT; ah->ah_noise_floor = -95; /* until first NF calibration is run */ sc->ani_state.ani_mode = ATH5K_ANI_MODE_AUTO; + ah->ah_current_channel = &sc->channels[0]; /* * Find the mac version |