linux-kernel - linux-next: manual merge of the mac80211-next tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20161003100211.68fe609c@canb.auug.org.au>
Date:   Mon, 3 Oct 2016 10:02:11 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Johannes Berg <johannes@...solutions.net>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Toke Høiland-Jørgensen <toke@...e.dk>,
        Felix Fietkau <nbd@....name>
Subject: linux-next: manual merge of the mac80211-next tree with Linus' tree

Hi Johannes,

Today's linux-next merge of the mac80211-next tree got a conflict in:

  net/mac80211/sta_info.c

between commit:

  83843c80dcf1 ("mac80211: fix tim recalculation after PS response")

from Linus' tree and commit:

  bb42f2d13ffc ("mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue")

from the mac80211-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/mac80211/sta_info.c
index 011880d633b4,167bff078bdd..000000000000
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@@ -1638,10 -1647,7 +1636,8 @@@ ieee80211_sta_ps_deliver_response(struc
  			return;
  
  		for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) {
- 			struct txq_info *txqi = to_txq_info(sta->sta.txq[tid]);
- 
 -			if (!(tids & BIT(tid)) || txq_has_queue(sta->sta.txq[tid]))
 +			if (!(driver_release_tids & BIT(tid)) ||
- 			    txqi->tin.backlog_packets)
++			    txq_has_queue(sta->sta.txq[tid]))
  				continue;
  
  			sta_info_recalc_tim(sta);