From c1f89b505be088ac70ca6441bc29b64bcd2974a1 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Fri, 3 Aug 2012 12:49:14 +0200 Subject: [PATCH] --- yaml --- r: 321591 b: refs/heads/master c: deee0214def5d8a32b8112f11d9c2b1696e9c0cb h: refs/heads/master i: 321589: 69e70fc852661c494e59fc6cada1b5d95b77e040 321587: 8d4f75e75e29eb714eb57fd9233eda88824e9f49 321583: 39d3cca9e4c27502aa01f3989ceac8ad8f3990a1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt61pci.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0437b35d0f75..80e48e8ba2c7 100644 --- 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 index f32259686b45..3f7bc5cadf9a 100644 --- 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); }