From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Wed, 2 May 2012 22:47:34 +0000 (-0700)
Subject: compat-wireless: refresh patches for next-20120501
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=40e81bc6369a0442fa76aa54a647398148872eab;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: refresh patches for next-20120501

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

diff --git a/patches/0001-netdev_ops.patch b/patches/0001-netdev_ops.patch
index 10f189ad87da..dc55be4b8913 100644
--- a/patches/0001-netdev_ops.patch
+++ b/patches/0001-netdev_ops.patch
@@ -93,7 +93,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  	dev->irq = sdev->irq;
 --- a/drivers/net/wireless/ipw2x00/ipw2100.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -6118,7 +6118,7 @@ static struct net_device *ipw2100_alloc_
+@@ -6116,7 +6116,7 @@ static struct net_device *ipw2100_alloc_
  	priv->ieee->perfect_rssi = -20;
  	priv->ieee->worst_rssi = -85;
  
@@ -104,7 +104,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  	priv->wireless_data.libipw = priv->ieee;
 --- a/drivers/net/wireless/ipw2x00/ipw2200.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
-@@ -11696,7 +11696,7 @@ static int ipw_prom_alloc(struct ipw_pri
+@@ -11682,7 +11682,7 @@ static int ipw_prom_alloc(struct ipw_pri
  	memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
  
  	priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -113,7 +113,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  
  	priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
  	SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11835,7 +11835,7 @@ static int __devinit ipw_pci_probe(struc
+@@ -11820,7 +11820,7 @@ static int __devinit ipw_pci_probe(struc
  	priv->ieee->perfect_rssi = -20;
  	priv->ieee->worst_rssi = -85;
  
diff --git a/patches/12-iw_handler-changes.patch b/patches/12-iw_handler-changes.patch
index 742b50019f74..ca9506a9fa1b 100644
--- a/patches/12-iw_handler-changes.patch
+++ b/patches/12-iw_handler-changes.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ipw2x00/ipw2100.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -6121,7 +6121,11 @@ static struct net_device *ipw2100_alloc_
+@@ -6119,7 +6119,11 @@ static struct net_device *ipw2100_alloc_
  	netdev_attach_ops(dev, &ipw2100_netdev_ops);
  	dev->ethtool_ops = &ipw2100_ethtool_ops;
  	dev->wireless_handlers = &ipw2100_wx_handler_def;
diff --git a/patches/12-mac80211-disable-tx-status.patch b/patches/12-mac80211-disable-tx-status.patch
index 423ed0a955e1..35f47efe03e8 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
-@@ -1977,6 +1977,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -1978,6 +1978,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;
-@@ -2015,6 +2016,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2016,6 +2017,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
  			skb = orig_skb;
  		}
  	}
diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch
index aa142bc9cbbd..9249b663fd41 100644
--- a/patches/22-multiqueue.patch
+++ b/patches/22-multiqueue.patch
@@ -30,7 +30,7 @@ in compat.
 
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -1497,6 +1497,10 @@ void ieee80211_xmit(struct ieee80211_sub
+@@ -1498,6 +1498,10 @@ void ieee80211_xmit(struct ieee80211_sub
  		return;
  	}