diff --git a/[refs] b/[refs] index d92bb829d4b5..0f4a84d19eb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 682dd04b37bc6b36356adda31e5435da8a246499 +refs/heads/master: 9d88c7f6709aab0e4342d80fad6fb7d3f7efc7ff diff --git a/trunk/net/mac80211/pm.c b/trunk/net/mac80211/pm.c index 2b53a5348ace..ef8eba1d736d 100644 --- a/trunk/net/mac80211/pm.c +++ b/trunk/net/mac80211/pm.c @@ -102,7 +102,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) state = sta->sta_state; for (; state > IEEE80211_STA_NOTEXIST; state--) - WARN_ON(drv_sta_state(local, sdata, sta, + WARN_ON(drv_sta_state(local, sta->sdata, sta, state, state - 1)); }