---

yaml --- r: 321591 b: refs/heads/master c: deee021 h: refs/heads/master i: 321589: 69e70fc 321587: 8d4f75e 321583: 39d3cca v: v3
git-mirror · Aug 6, 2012 · c1f89b5 · c1f89b5
1 parent 7e5d452
commit c1f89b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f6fc43e621167492ed4b7f3b4269c584c3d6ccc
+refs/heads/master: deee0214def5d8a32b8112f11d9c2b1696e9c0cb
diff --git a/trunk/drivers/net/wireless/rt2x00/rt61pci.c b/trunk/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2243,8 +2243,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
 
 static void rt61pci_wakeup(struct rt2x00_dev *rt2x00dev)
 {
-	struct ieee80211_conf conf = { .flags = 0 };
-	struct rt2x00lib_conf libconf = { .conf = &conf };
+	struct rt2x00lib_conf libconf = { .conf = &rt2x00dev->hw->conf };
 
 	rt61pci_config(rt2x00dev, &libconf, IEEE80211_CONF_CHANGE_PS);
 }