From 490e891e24e0a04b0510893c3d96d1cea2de7e1b Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Mon, 23 Nov 2009 16:15:19 -0500
Subject: [PATCH] --- yaml --- r: 168959 b: refs/heads/master c:
 54ab040d24904d1fa2c0a6a27936b7c56a4efb24 h: refs/heads/master i:   168957:
 60f68666ad7d8752e2e289c3662b9227e0bef307   168955:
 ff63bd4a88ad1c134df8c58cd5d80353ad3b5636   168951:
 cec74d775cb80ac36770e45f6e9ae992a4f5ebf1   168943:
 0ebe5e49affb03faf574b28c9b6faa6f7bcf7724   168927:
 2f80bb3c10cea3fee2adaefaeadbeac4d918df4f   168895:
 ad30c483eb35dcff1a7f3147b5d9fad3f0f1077c   168831:
 ccaaac79cef77466ec912b322973f312122e159e   168703:
 98fbea8ea5fda3786d867c9b576312c10fa85094   168447:
 9d33d6f7bfdc8580afaccc29bdbbab6aed4168a1   167935:
 ae7cd49d750547632377570b6e14c79bc9d09918 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b38229832b10..6f41cbd7004f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ceb99fe071eb688255798d89be337affffa2b103
+refs/heads/master: 54ab040d24904d1fa2c0a6a27936b7c56a4efb24
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
index 52bed89063d4..43d2be9867fc 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/main.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/main.c
@@ -1555,6 +1555,8 @@ void ath_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
 		BIT(NL80211_IFTYPE_ADHOC) |
 		BIT(NL80211_IFTYPE_MESH_POINT);
 
+	hw->wiphy->ps_default = false;
+
 	hw->queues = 4;
 	hw->max_rates = 4;
 	hw->channel_change_time = 5000;