From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Fri, 11 May 2012 21:32:29 +0000 (-0700)
Subject: compat-wireless: refresh patches for next-20120511
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4fdb168d24f34546bb8c30e5d6a2ca63e9f90f19;p=openwrt%2Fstaging%2Fblogic.git

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 35f47efe03e8..423ed0a955e1 100644
--- 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 de8e676f7ed0..6f9bc7f70fb7 100644
--- 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 66038b223b13..d0d4eacb5bfa 100644
--- 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 */