Update hunk offset for patches

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

diff --git a/compat/patches/01-netdev.patch b/compat/patches/01-netdev.patch
index 204834833a663b81a53c32c5788b61f5dc241d11..37f2a9eb86eca36970ee408f98396a3908eab296 100644 (file)
--- a/compat/patches/01-netdev.patch
+++ b/compat/patches/01-netdev.patch
@@ -100,8 +100,8 @@ without creating a headache on maintenance of the pathes.
  
        tmp = RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST;
        retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp,
---- a/net/mac80211/iface.c     2009-09-02 14:09:58.557123328 -0700
-+++ b/net/mac80211/iface.c     2009-09-02 14:10:02.137093336 -0700
+--- a/net/mac80211/iface.c     2009-11-13 11:36:21.000000000 -0800
++++ b/net/mac80211/iface.c     2009-11-13 11:36:21.000000000 -0800
 @@ -644,6 +644,7 @@
        WARN_ON(flushed);
  }
@@ -157,7 +157,7 @@ without creating a headache on maintenance of the pathes.
                sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
                                      MONITOR_FLAG_OTHER_BSS;
                break;
-@@ -776,6 +796,8 @@
+@@ -777,6 +797,8 @@
                return -ENOMEM;
        dev_net_set(ndev, wiphy_net(local->hw.wiphy));
  
@@ -166,7 +166,7 @@ without creating a headache on maintenance of the pathes.
        ndev->needed_headroom = local->tx_headroom +
                                4*6 /* four MAC addresses */
                                + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -784,6 +806,7 @@
+@@ -785,6 +807,7 @@
                                - ETH_HLEN /* ethernet hard_header_len */
                                + IEEE80211_ENCRYPT_HEADROOM;
        ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
@@ -174,7 +174,7 @@ without creating a headache on maintenance of the pathes.
  
        ret = dev_alloc_name(ndev, ndev->name);
        if (ret < 0)
-@@ -818,6 +841,10 @@
+@@ -819,6 +842,10 @@
        if (ret)
                goto fail;
  
@@ -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.libipw = priv->ieee;
---- 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
-@@ -11626,6 +11626,7 @@
+--- a/drivers/net/wireless/ipw2x00/ipw2200.c   2009-11-13 11:37:43.000000000 -0800
++++ b/drivers/net/wireless/ipw2x00/ipw2200.c   2009-11-13 11:37:43.000000000 -0800
+@@ -11631,6 +11631,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,
-@@ -11634,6 +11635,7 @@
+@@ -11639,6 +11640,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)
  {
-@@ -11654,7 +11656,13 @@
+@@ -11659,7 +11661,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);
-@@ -11682,6 +11690,7 @@
+@@ -11687,6 +11695,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,
-@@ -11692,6 +11701,7 @@
+@@ -11697,6 +11706,7 @@
        .ndo_change_mtu         = libipw_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)
-@@ -11793,7 +11803,15 @@
+@@ -11798,7 +11808,15 @@
        priv->ieee->perfect_rssi = -20;
        priv->ieee->worst_rssi = -85;
  

diff --git a/compat/patches/08-rename-iwl4965-config.patch b/compat/patches/08-rename-iwl4965-config.patch
index 78a6b6fa84e62f7f194e20673b28b2a764d7407a..997028a2e69c6a3f6ed7f275fa7016115429d88e 100644 (file)
--- a/compat/patches/08-rename-iwl4965-config.patch
+++ b/compat/patches/08-rename-iwl4965-config.patch
@@ -14,9 +14,9 @@ CONFIG_IWL4965 has to be set to y, to build correctly.
  iwlagn-$(CONFIG_IWL5000) += iwl-5000.o
  iwlagn-$(CONFIG_IWL5000) += iwl-6000.o
  iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
---- a/drivers/net/wireless/iwlwifi/iwl-agn.c   2009-11-02 08:07:33.000000000 -0800
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c   2009-11-02 08:07:33.000000000 -0800
-@@ -3416,10 +3416,10 @@
+--- a/drivers/net/wireless/iwlwifi/iwl-agn.c   2009-11-13 11:38:35.000000000 -0800
++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c   2009-11-13 11:38:36.000000000 -0800
+@@ -3449,10 +3449,10 @@
  
  /* Hardware specific file defines the PCI IDs table for that hardware module */
  static struct pci_device_id iwl_hw_card_ids[] = {

diff --git a/compat/patches/09-threaded-irq.patch b/compat/patches/09-threaded-irq.patch
index a5aace690c68ce56d8d93883ba6baf9f484fa941..6731ee8d1370f73ea81fd4428adae18f0f6e6268 100644 (file)
--- a/compat/patches/09-threaded-irq.patch
+++ b/compat/patches/09-threaded-irq.patch
@@ -4,8 +4,8 @@ on older kernels we built our own struct compat_threaded_irq
 to queue_work() onto it as the kernel thread be running the
 thread in process context as well.
 
---- a/drivers/net/wireless/b43/main.c  2009-10-19 11:35:00.000000000 +0900
-+++ b/drivers/net/wireless/b43/main.c  2009-10-19 11:35:02.000000000 +0900
+--- a/drivers/net/wireless/b43/main.c  2009-11-13 11:39:32.000000000 -0800
++++ b/drivers/net/wireless/b43/main.c  2009-11-13 11:39:33.000000000 -0800
 @@ -3909,8 +3909,13 @@
        if (dev->dev->bus->bustype == SSB_BUSTYPE_SDIO) {
                b43_sdio_free_irq(dev);
@@ -38,7 +38,7 @@ thread in process context as well.
                if (err) {
                        b43err(dev->wl, "Cannot request IRQ-%d\n", dev->dev->irq);
                        goto out;
-@@ -4660,6 +4673,10 @@
+@@ -4659,6 +4672,10 @@
  
  static void b43_wireless_core_detach(struct b43_wldev *dev)
  {

diff --git a/compat/patches/14-device-type.patch b/compat/patches/14-device-type.patch
index 0fbab4417ee3b6043c1b5cbedddcff43e2ffbf4b..e1eaf347cfc40fbd9cc6b9089991e47c65cad1c6 100644 (file)
--- a/compat/patches/14-device-type.patch
+++ b/compat/patches/14-device-type.patch
@@ -6,9 +6,9 @@ SET_NETDEV_DEVTYPE() be a no-op this means the wireless type
 we define is unused so we ucomment it simply to avoid a
 compile warning.
 
---- a/net/mac80211/iface.c     2009-10-08 19:17:40.000000000 -0400
-+++ b/net/mac80211/iface.c     2009-10-08 19:17:48.000000000 -0400
-@@ -776,9 +776,11 @@
+--- a/net/mac80211/iface.c     2009-11-13 11:40:39.000000000 -0800
++++ b/net/mac80211/iface.c     2009-11-13 11:40:39.000000000 -0800
+@@ -777,9 +777,11 @@
        return 0;
  }
  

diff --git a/compat/patches/15-symbol-export-conflicts.patch b/compat/patches/15-symbol-export-conflicts.patch
index 1f2e9e6ffd1eb1417d730df0b8184c9559c5f869..a7a35d8caab89d6a2a04b4491f0502180d649517 100644 (file)
--- a/compat/patches/15-symbol-export-conflicts.patch
+++ b/compat/patches/15-symbol-export-conflicts.patch
@@ -1,9 +1,9 @@
 In kernel < 2.6.32 libipw also exports ieee80211_rx.
 To avoid conflicts with the other export we rename our.
 
---- a/net/mac80211/rx.c        2009-11-02 08:08:54.000000000 -0800
-+++ b/net/mac80211/rx.c        2009-11-02 08:08:55.000000000 -0800
-@@ -2480,7 +2480,12 @@
+--- a/net/mac80211/rx.c        2009-11-13 11:41:29.000000000 -0800
++++ b/net/mac80211/rx.c        2009-11-13 11:41:30.000000000 -0800
+@@ -2508,7 +2508,12 @@
   drop:
        kfree_skb(skb);
  }