linux-kernel - linux-next: manual merge of the tip tree with the wireless 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Tue, 17 May 2011 13:14:17 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lai Jiangshan <laijs@...fujitsu.com>,
	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>,
	"David S. Miller" <davem@...emloft.net>,
	"John W. Linville" <linville@...driver.com>,
	Johannes Berg <johannes.berg@...el.com>
Subject: linux-next: manual merge of the tip tree with the wireless tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
net/mac80211/agg-tx.c between commit ec034b208dc8 ("mac80211: fix TX
a-MPDU locking") from the wireless tree and commit 0744371aeba7
("net,rcu: convert call_rcu(kfree_tid_tx) to kfree_rcu()") from the tip
tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc net/mac80211/agg-tx.c
index cd5125f,53defaf..0000000
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@@ -136,22 -136,6 +136,14 @@@ void ieee80211_send_bar(struct ieee8021
  	ieee80211_tx_skb(sdata, skb);
  }
  
 +void ieee80211_assign_tid_tx(struct sta_info *sta, int tid,
 +			     struct tid_ampdu_tx *tid_tx)
 +{
 +	lockdep_assert_held(&sta->ampdu_mlme.mtx);
 +	lockdep_assert_held(&sta->lock);
 +	rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], tid_tx);
 +}
 +
- static void kfree_tid_tx(struct rcu_head *rcu_head)
- {
- 	struct tid_ampdu_tx *tid_tx =
- 	    container_of(rcu_head, struct tid_ampdu_tx, rcu_head);
- 
- 	kfree(tid_tx);
- }
- 
  int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
  				    enum ieee80211_back_parties initiator,
  				    bool tx)
@@@ -162,19 -146,16 +154,19 @@@
  
  	lockdep_assert_held(&sta->ampdu_mlme.mtx);
  
 -	if (!tid_tx)
 -		return -ENOENT;
 -
  	spin_lock_bh(&sta->lock);
  
 +	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 +	if (!tid_tx) {
 +		spin_unlock_bh(&sta->lock);
 +		return -ENOENT;
 +	}
 +
  	if (test_bit(HT_AGG_STATE_WANT_START, &tid_tx->state)) {
  		/* not even started yet! */
 -		rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], NULL);
 +		ieee80211_assign_tid_tx(sta, tid, NULL);
  		spin_unlock_bh(&sta->lock);
- 		call_rcu(&tid_tx->rcu_head, kfree_tid_tx);
+ 		kfree_rcu(tid_tx, rcu_head);
  		return 0;
  	}
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/