From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Thu, 20 Aug 2009 20:51:42 +0000 (-0700)
Subject: Update hunks offsets for master-2009-08-20
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bdc7ad93844c2198ee1dae06423a7a2829e89989;p=openwrt%2Fstaging%2Fblogic.git

Update hunks offsets for master-2009-08-20

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---

diff --git a/compat/patches/01-netdev.patch b/compat/patches/01-netdev.patch
index 931f0ea84bbf..f0d54d552e6d 100644
--- a/compat/patches/01-netdev.patch
+++ b/compat/patches/01-netdev.patch
@@ -333,9 +333,9 @@ without creating a headache on maintenance of the pathes.
  	dev->ethtool_ops = &ipw2100_ethtool_ops;
  	dev->wireless_handlers = &ipw2100_wx_handler_def;
  	priv->wireless_data.ieee80211 = priv->ieee;
---- a/drivers/net/wireless/ipw2x00/ipw2200.c	2009-07-21 13:18:54.353940665 -0700
-+++ b/drivers/net/wireless/ipw2x00/ipw2200.c	2009-07-21 13:18:54.537944910 -0700
-@@ -11525,6 +11525,7 @@
+--- a/drivers/net/wireless/ipw2x00/ipw2200.c	2009-08-20 13:47:07.311291621 -0700
++++ b/drivers/net/wireless/ipw2x00/ipw2200.c	2009-08-20 13:47:07.783268230 -0700
+@@ -11524,6 +11524,7 @@
  	return NETDEV_TX_OK;
  }
  
@@ -343,7 +343,7 @@ without creating a headache on maintenance of the pathes.
  static const struct net_device_ops ipw_prom_netdev_ops = {
  	.ndo_open 		= ipw_prom_open,
  	.ndo_stop		= ipw_prom_stop,
-@@ -11533,6 +11534,7 @@
+@@ -11532,6 +11533,7 @@
  	.ndo_set_mac_address 	= eth_mac_addr,
  	.ndo_validate_addr	= eth_validate_addr,
  };
@@ -351,7 +351,7 @@ without creating a headache on maintenance of the pathes.
  
  static int ipw_prom_alloc(struct ipw_priv *priv)
  {
-@@ -11553,7 +11555,13 @@
+@@ -11552,7 +11554,13 @@
  	memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
  
  	priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -365,7 +365,7 @@ without creating a headache on maintenance of the pathes.
  
  	priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
  	SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11581,6 +11589,7 @@
+@@ -11580,6 +11588,7 @@
  
  #endif
  
@@ -373,7 +373,7 @@ without creating a headache on maintenance of the pathes.
  static const struct net_device_ops ipw_netdev_ops = {
  	.ndo_init		= ipw_net_init,
  	.ndo_open		= ipw_net_open,
-@@ -11591,6 +11600,7 @@
+@@ -11590,6 +11599,7 @@
  	.ndo_change_mtu		= ieee80211_change_mtu,
  	.ndo_validate_addr	= eth_validate_addr,
  };
@@ -381,7 +381,7 @@ without creating a headache on maintenance of the pathes.
  
  static int __devinit ipw_pci_probe(struct pci_dev *pdev,
  				   const struct pci_device_id *ent)
-@@ -11692,7 +11702,15 @@
+@@ -11691,7 +11701,15 @@
  	priv->ieee->perfect_rssi = -20;
  	priv->ieee->worst_rssi = -85;
  
diff --git a/compat/patches/03-rfkill.patch b/compat/patches/03-rfkill.patch
index 0e6ad9d19452..61eb7628e221 100644
--- a/compat/patches/03-rfkill.patch
+++ b/compat/patches/03-rfkill.patch
@@ -43,8 +43,8 @@ just keep /dev/rfkill and not /dev/rfkill_backport.
  
  	/* causes rfkill_start() to be called */
  	error = input_register_handle(handle);
---- a/net/rfkill/core.c	2009-08-04 10:54:43.078999821 -0700
-+++ b/net/rfkill/core.c	2009-08-04 10:54:43.555024585 -0700
+--- a/net/rfkill/core.c	2009-08-20 13:48:36.083267397 -0700
++++ b/net/rfkill/core.c	2009-08-20 13:48:37.051267098 -0700
 @@ -26,7 +26,7 @@
  #include <linux/capability.h>
  #include <linux/list.h>
@@ -117,7 +117,7 @@ just keep /dev/rfkill and not /dev/rfkill_backport.
  static long rfkill_fop_ioctl(struct file *file, unsigned int cmd,
  			     unsigned long arg)
  {
-@@ -1193,9 +1193,9 @@
+@@ -1193,7 +1193,7 @@
  	.write		= rfkill_fop_write,
  	.poll		= rfkill_fop_poll,
  	.release	= rfkill_fop_release,
@@ -126,8 +126,6 @@ just keep /dev/rfkill and not /dev/rfkill_backport.
  	.unlocked_ioctl	= rfkill_fop_ioctl,
  	.compat_ioctl	= rfkill_fop_ioctl,
  #endif
- };
- 
 @@ -1223,7 +1223,7 @@
  		goto out;
  	}