diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /net/mac80211/rx.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 2e8a9024625a..9dce3b157908 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -1268,7 +1268,7 @@ static void sta_ps_start(struct sta_info *sta) | |||
| 1268 | for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) { | 1268 | for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) { |
| 1269 | struct txq_info *txqi = to_txq_info(sta->sta.txq[tid]); | 1269 | struct txq_info *txqi = to_txq_info(sta->sta.txq[tid]); |
| 1270 | 1270 | ||
| 1271 | if (!txqi->tin.backlog_packets) | 1271 | if (txqi->tin.backlog_packets) |
| 1272 | set_bit(tid, &sta->txq_buffered_tids); | 1272 | set_bit(tid, &sta->txq_buffered_tids); |
| 1273 | else | 1273 | else |
| 1274 | clear_bit(tid, &sta->txq_buffered_tids); | 1274 | clear_bit(tid, &sta->txq_buffered_tids); |