diff options
| author | Ben Greear <greearb@candelatech.com> | 2010-09-30 12:22:58 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-05 13:35:23 -0400 |
| commit | b1ae1edf9e9872d3aa657cc34ae40c9aadfbc72f (patch) | |
| tree | b2924525915d701ddef46f7c2e3832f8f1e28194 /drivers/net/wireless/ath/ath5k/reset.c | |
| parent | ea229e682633a18c1fa2c408400a6923cfc47910 (diff) | |
| download | linux-3.10-b1ae1edf9e9872d3aa657cc34ae40c9aadfbc72f.tar.gz linux-3.10-b1ae1edf9e9872d3aa657cc34ae40c9aadfbc72f.tar.bz2 linux-3.10-b1ae1edf9e9872d3aa657cc34ae40c9aadfbc72f.zip | |
ath5k: Allow ath5k to support virtual STA and AP interfaces.
Support up to 4 virtual APs and as many virtual STA interfaces
as desired.
This patch is ported forward from a patch that Patrick McHardy
did for me against 2.6.31.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Acked-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/reset.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/reset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c index 58912cd762d..5b179d01f97 100644 --- a/drivers/net/wireless/ath/ath5k/reset.c +++ b/drivers/net/wireless/ath/ath5k/reset.c @@ -167,7 +167,7 @@ static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah, * ieee80211_duration() for a brief description of * what rate we should choose to TX ACKs. */ tx_time = le16_to_cpu(ieee80211_generic_frame_duration(sc->hw, - sc->vif, 10, rate)); + NULL, 10, rate)); ath5k_hw_reg_write(ah, tx_time, reg); @@ -1060,7 +1060,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, * XXX: rethink this after new mode changes to * mac80211 are integrated */ if (ah->ah_version == AR5K_AR5212 && - ah->ah_sc->vif != NULL) + ah->ah_sc->nvifs) ath5k_hw_write_rate_duration(ah, mode); /* |