diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-17 13:11:43 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-17 13:11:43 -0500 |
| commit | e11c259f745889b55bc5596ca78271f2f5cf08d2 (patch) | |
| tree | 5025f0bf9093e84d0643beb9097249c176dbbea7 /net/mac80211/pm.c | |
| parent | 8d26784cf0d04c1238e906efdd5de76439cb0a1e (diff) | |
| parent | b4487c2d0edaf1332d7a9f11b5661044955ef5e2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
include/net/bluetooth/bluetooth.h
Diffstat (limited to 'net/mac80211/pm.c')
| -rw-r--r-- | net/mac80211/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 9ee7164b207c..596efaf50e09 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c | |||
| @@ -125,7 +125,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) | |||
| 125 | ieee80211_bss_info_change_notify(sdata, | 125 | ieee80211_bss_info_change_notify(sdata, |
| 126 | BSS_CHANGED_BEACON_ENABLED); | 126 | BSS_CHANGED_BEACON_ENABLED); |
| 127 | 127 | ||
| 128 | drv_remove_interface(local, &sdata->vif); | 128 | drv_remove_interface(local, sdata); |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | /* stop hardware - this must stop RX */ | 131 | /* stop hardware - this must stop RX */ |