compat-wireless: refresh patches for next-20120511

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

diff --git a/patches/12-mac80211-disable-tx-status.patch b/patches/12-mac80211-disable-tx-status.patch
index 35f47efe03e867b676452792765a510a38d6ecb7..423ed0a955e187fb7f7e252ef60460f91d66d7ba 100644 (file)
--- a/patches/12-mac80211-disable-tx-status.patch
+++ b/patches/12-mac80211-disable-tx-status.patch
@@ -6,7 +6,7 @@ So we need to just ifdef this part out.
 
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -1978,6 +1978,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -1977,6 +1977,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
                goto fail;
        }
  
@@ -14,7 +14,7 @@ So we need to just ifdef this part out.
        if (unlikely(!multicast && skb->sk &&
                     skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) {
                struct sk_buff *orig_skb = skb;
-@@ -2016,6 +2017,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2015,6 +2016,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
                        skb = orig_skb;
                }
        }

diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch
index de8e676f7ed0e00dbdc34bdb7bf40041aadaf4ad..6f9bc7f70fb728d014224472ac0910b60c5216aa 100644 (file)
--- a/patches/15-symbol-export-conflicts.patch
+++ b/patches/15-symbol-export-conflicts.patch
@@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our.
 
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -3105,7 +3105,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -3102,7 +3102,12 @@ void ieee80211_rx(struct ieee80211_hw *h
   drop:
        kfree_skb(skb);
  }

diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch
index 66038b223b13cdb65418dca2e17f863a2be93d19..d0d4eacb5bfafafd90824297ebe9990e0bbe6137 100644 (file)
--- a/patches/30-bridge-port.patch
+++ b/patches/30-bridge-port.patch
@@ -23,7 +23,7 @@ compat-wireless.
 
 --- a/net/wireless/util.c
 +++ b/net/wireless/util.c
-@@ -799,7 +799,7 @@ int cfg80211_change_iface(struct cfg8021
+@@ -798,7 +798,7 @@ int cfg80211_change_iface(struct cfg8021
                return -EOPNOTSUPP;
  
        /* if it's part of a bridge, reject changing type to station/ibss */