Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / net / mac80211 / pm.c

diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index e535f1c988fe74cd2f5b147977b8904e3d74ee36..05e161c3cbc548bba9942a8221e60a73fb5dc1b7 100644 (file)
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -65,7 +65,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
                                             struct ieee80211_sub_if_data,
                                             u.ap);
 
-                       drv_sta_notify(local, &sdata->vif, STA_NOTIFY_REMOVE,
+                       drv_sta_notify(local, sdata, STA_NOTIFY_REMOVE,
                                       &sta->sta);
                }
 
@@ -102,7 +102,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
 
                conf.vif = &sdata->vif;
                conf.type = sdata->vif.type;
-               conf.mac_addr = sdata->dev->dev_addr;
+               conf.mac_addr = sdata->vif.addr;
                drv_remove_interface(local, &conf);
        }