From: David S. Miller <davem@davemloft.net>
Date: Wed, 2 Dec 2009 06:13:38 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.33-rc1~388^2~104
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=ff9c38bba37937adb909cceb2a6521f2e92e17c6

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	net/mac80211/ht.c
---

ff9c38bba37937adb909cceb2a6521f2e92e17c6
diff --cc net/mac80211/agg-tx.c
index adf01fc,89e238b..5e3a7ec
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@@ -120,12 -120,11 +120,12 @@@ void ieee80211_send_bar(struct ieee8021
  	bar->control = cpu_to_le16(bar_control);
  	bar->start_seq_num = cpu_to_le16(ssn);
  
 -	ieee80211_tx_skb(sdata, skb, 0);
 +	IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
 +	ieee80211_tx_skb(sdata, skb);
  }
  
- static int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
- 					   enum ieee80211_back_parties initiator)
+ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
+ 				    enum ieee80211_back_parties initiator)
  {
  	struct ieee80211_local *local = sta->local;
  	int ret;
@@@ -527,14 -536,15 +526,14 @@@ int __ieee80211_stop_tx_ba_session(stru
  	return ret;
  }
  
 -int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw,
 -				 u8 *ra, u16 tid,
 +int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
  				 enum ieee80211_back_parties initiator)
  {
 -	struct ieee80211_local *local = hw_to_local(hw);
 -	struct sta_info *sta;
 -	int ret = 0;
 +	struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
 +	struct ieee80211_sub_if_data *sdata = sta->sdata;
 +	struct ieee80211_local *local = sdata->local;
  
- 	if (WARN_ON(!local->ops->ampdu_action))
+ 	if (!local->ops->ampdu_action)
  		return -EINVAL;
  
  	if (tid >= STA_TID_NUM)