diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-23 17:01:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-23 17:01:47 -0500 |
| commit | b5b5150977cdfb7173f4468ccd30f9b4a981b902 (patch) | |
| tree | 27d477910d630a027c0b447a58ae61b1c57dbca5 /drivers | |
| parent | dcfcb256cc23c4436691b0fe677275306699d6a1 (diff) | |
| parent | 45ba564d765d6165330e9bb14a197bdd348c114d (diff) | |
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/ath9k/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 52bed89063d4..43d2be9867fc 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
| @@ -1555,6 +1555,8 @@ void ath_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) | |||
| 1555 | BIT(NL80211_IFTYPE_ADHOC) | | 1555 | BIT(NL80211_IFTYPE_ADHOC) | |
| 1556 | BIT(NL80211_IFTYPE_MESH_POINT); | 1556 | BIT(NL80211_IFTYPE_MESH_POINT); |
| 1557 | 1557 | ||
| 1558 | hw->wiphy->ps_default = false; | ||
| 1559 | |||
| 1558 | hw->queues = 4; | 1560 | hw->queues = 4; |
| 1559 | hw->max_rates = 4; | 1561 | hw->max_rates = 4; |
| 1560 | hw->channel_change_time = 5000; | 1562 | hw->channel_change_time = 5000; |