Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 2 Dec 2009 06:13:38 +0000 (22:13 -0800)]
Conflicts:
net/mac80211/ht.c

16 files changed:
1  2 
MAINTAINERS
drivers/net/e100.c
drivers/net/r8169.c
drivers/net/smc91x.c
drivers/net/smsc9420.c
drivers/net/wan/cosa.c
drivers/net/wireless/iwlwifi/iwl-tx.c
include/net/mac80211.h
net/ipv4/ip_fragment.c
net/ipv4/ip_output.c
net/ipv4/tcp.c
net/mac80211/agg-rx.c
net/mac80211/agg-tx.c
net/mac80211/ht.c
net/mac80211/ieee80211_i.h
net/xfrm/xfrm_algo.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
Simple merge
@@@ -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)
Simple merge
Simple merge
Simple merge