diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-22 13:54:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-22 13:54:12 -0400 |
| commit | 8ceedea7c2600a1018d20f67e766c0773b59391a (patch) | |
| tree | 596b2e9ceb312903d7437825dc45c9aa838ff71f /drivers/net/wireless | |
| parent | d5dc0ae4df9db00b8122378d56a071039b17a1eb (diff) | |
| parent | b6855772f4a22c4fbdd4fcaceff5c8a527035123 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless')
| -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) | |||
| 126 | ah->ah_ant_mode = AR5K_ANTMODE_DEFAULT; | 126 | ah->ah_ant_mode = AR5K_ANTMODE_DEFAULT; |
| 127 | ah->ah_noise_floor = -95; /* until first NF calibration is run */ | 127 | ah->ah_noise_floor = -95; /* until first NF calibration is run */ |
| 128 | sc->ani_state.ani_mode = ATH5K_ANI_MODE_AUTO; | 128 | sc->ani_state.ani_mode = ATH5K_ANI_MODE_AUTO; |
| 129 | ah->ah_current_channel = &sc->channels[0]; | ||
| 129 | 130 | ||
| 130 | /* | 131 | /* |
| 131 | * Find the mac version | 132 | * Find the mac version |