diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-11-21 14:31:52 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-11-21 14:31:52 -0500 |
| commit | 9c3f9e281697d02889c3b08922f3b30be75f56c2 (patch) | |
| tree | e9f3d68e0019a47b982e2b8644f70eb66a3eff3c /net/mac80211/sta_info.c | |
| parent | b8f61116c1ce342804a0897b0a80eb4df5f19453 (diff) | |
| parent | d6ad418763888f617ac5b4849823e4cd670df1dd (diff) | |
Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Fix trivial conflicts in: kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 797dd36a220d..0a4e4c04db89 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
| @@ -650,7 +650,7 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local, | |||
| 650 | */ | 650 | */ |
| 651 | if (!skb) | 651 | if (!skb) |
| 652 | break; | 652 | break; |
| 653 | dev_kfree_skb(skb); | 653 | ieee80211_free_txskb(&local->hw, skb); |
| 654 | } | 654 | } |
| 655 | 655 | ||
| 656 | /* | 656 | /* |
| @@ -679,7 +679,7 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local, | |||
| 679 | local->total_ps_buffered--; | 679 | local->total_ps_buffered--; |
| 680 | ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n", | 680 | ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n", |
| 681 | sta->sta.addr); | 681 | sta->sta.addr); |
| 682 | dev_kfree_skb(skb); | 682 | ieee80211_free_txskb(&local->hw, skb); |
| 683 | } | 683 | } |
| 684 | 684 | ||
| 685 | /* | 685 | /* |