Update hunk offsets for compat 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 f0d54d552e6d8bb6a72b1e81af848d042587dde3..767bcc9d7370e218178ce6d5c6521010682f61db 100644 (file)
--- a/compat/patches/01-netdev.patch
+++ b/compat/patches/01-netdev.patch
@@ -70,9 +70,9 @@ without creating a headache on maintenance of the pathes.
        net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
        net->ethtool_ops = &usbnet_ethtool_ops;
  
---- a/drivers/net/wireless/rndis_wlan.c        2009-08-18 16:15:04.501372272 -0700
-+++ b/drivers/net/wireless/rndis_wlan.c        2009-08-18 16:15:04.621354357 -0700
-@@ -2800,6 +2800,7 @@ static int bcm4320b_early_init(struct us
+--- a/drivers/net/wireless/rndis_wlan.c        2009-09-02 14:08:52.418110490 -0700
++++ b/drivers/net/wireless/rndis_wlan.c        2009-09-02 14:08:52.930092180 -0700
+@@ -2667,6 +2667,7 @@
        return 0;
  }
  
@@ -80,15 +80,15 @@ without creating a headache on maintenance of the pathes.
  /* same as rndis_netdev_ops but with local multicast handler */
  static const struct net_device_ops rndis_wlan_netdev_ops = {
        .ndo_open               = usbnet_open,
-@@ -2810,6 +2811,7 @@ static const struct net_device_ops rndis
+@@ -2677,6 +2678,7 @@
        .ndo_validate_addr      = eth_validate_addr,
        .ndo_set_multicast_list = rndis_wlan_set_multicast_list,
  };
 +#endif
  
- 
  static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)
-@@ -2860,7 +2862,11 @@ static int rndis_wlan_bind(struct usbnet
+ {
+@@ -2724,7 +2726,11 @@
         * rndis_host wants to avoid all OID as much as possible
         * so do promisc/multicast handling in rndis_wlan.
         */
@@ -100,9 +100,9 @@ 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-08-18 16:16:16.321354483 -0700
-+++ b/net/mac80211/iface.c     2009-08-18 16:16:17.205374108 -0700
-@@ -675,6 +675,7 @@ static void ieee80211_teardown_sdata(str
+--- 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
+@@ -642,6 +642,7 @@
        WARN_ON(flushed);
  }
  
@@ -110,7 +110,7 @@ without creating a headache on maintenance of the pathes.
  static const struct net_device_ops ieee80211_dataif_ops = {
        .ndo_open               = ieee80211_open,
        .ndo_stop               = ieee80211_stop,
-@@ -694,11 +695,22 @@ static const struct net_device_ops ieee8
+@@ -661,11 +662,22 @@
        .ndo_change_mtu         = ieee80211_change_mtu,
        .ndo_set_mac_address    = eth_mac_addr,
  };
@@ -133,7 +133,7 @@ without creating a headache on maintenance of the pathes.
        dev->destructor = free_netdev;
  }
  
-@@ -713,7 +725,11 @@ static void ieee80211_setup_sdata(struct
+@@ -680,7 +692,11 @@
  
        /* and set some type-dependent values */
        sdata->vif.type = type;
@@ -145,7 +145,7 @@ without creating a headache on maintenance of the pathes.
        sdata->wdev.iftype = type;
  
        /* only monitor differs */
-@@ -736,7 +752,11 @@ static void ieee80211_setup_sdata(struct
+@@ -703,7 +719,11 @@
                break;
        case NL80211_IFTYPE_MONITOR:
                sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -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;
-@@ -803,6 +823,8 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -770,6 +790,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 */
-@@ -811,6 +833,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -778,6 +800,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)
-@@ -843,6 +866,10 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -810,6 +833,10 @@
        if (ret)
                goto fail;
  
@@ -185,9 +185,9 @@ without creating a headache on maintenance of the pathes.
        if (ieee80211_vif_is_mesh(&sdata->vif) &&
            params && params->mesh_id_len)
                ieee80211_sdata_set_mesh_id(sdata,
---- a/drivers/net/b44.c
-+++ b/drivers/net/b44.c
-@@ -2112,6 +2112,7 @@ static int __devinit b44_get_invariants(struct b44 *bp)
+--- a/drivers/net/b44.c        2009-09-02 14:11:16.241100413 -0700
++++ b/drivers/net/b44.c        2009-09-02 14:11:16.485096724 -0700
+@@ -2113,6 +2113,7 @@
        return err;
  }
  
@@ -195,7 +195,7 @@ without creating a headache on maintenance of the pathes.
  static const struct net_device_ops b44_netdev_ops = {
        .ndo_open               = b44_open,
        .ndo_stop               = b44_close,
-@@ -2127,6 +2128,7 @@ static const struct net_device_ops b44_netdev_ops = {
+@@ -2128,6 +2129,7 @@
        .ndo_poll_controller    = b44_poll_controller,
  #endif
  };
@@ -203,7 +203,7 @@ without creating a headache on maintenance of the pathes.
  
  static int __devinit b44_init_one(struct ssb_device *sdev,
                                  const struct ssb_device_id *ent)
-@@ -2166,9 +2168,26 @@ static int __devinit b44_init_one(struct ssb_device *sdev,
+@@ -2167,9 +2169,26 @@
        bp->rx_pending = B44_DEF_RX_RING_PENDING;
        bp->tx_pending = B44_DEF_TX_RING_PENDING;
  
@@ -298,9 +298,9 @@ without creating a headache on maintenance of the pathes.
  }
  EXPORT_SYMBOL(wireless_send_event);
  
---- a/drivers/net/wireless/ipw2x00/ipw2100.c
-+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -6008,6 +6008,7 @@ static void ipw2100_rf_kill(struct work_struct *work)
+--- a/drivers/net/wireless/ipw2x00/ipw2100.c   2009-09-02 14:12:00.958117808 -0700
++++ b/drivers/net/wireless/ipw2x00/ipw2100.c   2009-09-02 14:12:01.382115761 -0700
+@@ -6008,6 +6008,7 @@
  
  static void ipw2100_irq_tasklet(struct ipw2100_priv *priv);
  
@@ -308,7 +308,7 @@ without creating a headache on maintenance of the pathes.
  static const struct net_device_ops ipw2100_netdev_ops = {
        .ndo_open               = ipw2100_open,
        .ndo_stop               = ipw2100_close,
-@@ -6018,6 +6019,7 @@ static const struct net_device_ops ipw2100_netdev_ops = {
+@@ -6018,6 +6019,7 @@
        .ndo_set_mac_address    = ipw2100_set_address,
        .ndo_validate_addr      = eth_validate_addr,
  };
@@ -316,7 +316,7 @@ without creating a headache on maintenance of the pathes.
  
  /* Look into using netdev destructor to shutdown ieee80211? */
  
-@@ -6043,7 +6045,16 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
+@@ -6043,7 +6045,16 @@
        priv->ieee->perfect_rssi = -20;
        priv->ieee->worst_rssi = -85;
  
@@ -332,71 +332,7 @@ 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-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;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
- static const struct net_device_ops ipw_prom_netdev_ops = {
-       .ndo_open               = ipw_prom_open,
-       .ndo_stop               = ipw_prom_stop,
-@@ -11532,6 +11533,7 @@
-       .ndo_set_mac_address    = eth_mac_addr,
-       .ndo_validate_addr      = eth_validate_addr,
- };
-+#endif
- 
- static int ipw_prom_alloc(struct ipw_priv *priv)
- {
-@@ -11552,7 +11554,13 @@
-       memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
- 
-       priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
-       priv->prom_net_dev->netdev_ops = &ipw_prom_netdev_ops;
-+#else
-+      priv->prom_net_dev->open = ipw_prom_open;
-+      priv->prom_net_dev->stop = ipw_prom_stop;
-+      priv->prom_net_dev->hard_start_xmit = ipw_prom_hard_start_xmit;
-+#endif
- 
-       priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
-       SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11580,6 +11588,7 @@
- 
- #endif
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
- static const struct net_device_ops ipw_netdev_ops = {
-       .ndo_init               = ipw_net_init,
-       .ndo_open               = ipw_net_open,
-@@ -11590,6 +11599,7 @@
-       .ndo_change_mtu         = ieee80211_change_mtu,
-       .ndo_validate_addr      = eth_validate_addr,
- };
-+#endif
- 
- static int __devinit ipw_pci_probe(struct pci_dev *pdev,
-                                  const struct pci_device_id *ent)
-@@ -11691,7 +11701,15 @@
-       priv->ieee->perfect_rssi = -20;
-       priv->ieee->worst_rssi = -85;
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
-       net_dev->netdev_ops = &ipw_netdev_ops;
-+#else
-+      net_dev->open = ipw_net_open;
-+      net_dev->stop = ipw_net_stop;
-+      net_dev->init = ipw_net_init;
-+      net_dev->set_multicast_list = ipw_net_set_multicast_list;
-+      net_dev->set_mac_address = ipw_net_set_mac_address;
-+#endif
-       priv->wireless_data.spy_data = &priv->ieee->spy_data;
-       net_dev->wireless_data = &priv->wireless_data;
-       net_dev->wireless_handlers = &ipw_wx_handler_def;
+       priv->wireless_data.libipw = priv->ieee;
 --- a/drivers/net/wireless/libertas/main.c     2009-08-18 16:17:34.669375612 -0700
 +++ b/drivers/net/wireless/libertas/main.c     2009-08-18 16:17:35.277375431 -0700
 @@ -1148,6 +1148,7 @@

diff --git a/compat/patches/02-ksize.patch b/compat/patches/02-ksize.patch
index 219bb7b82ff2ec1217318707a64f64db6c399608..e216dae392247c50e85530a7e02359920241228d 100644 (file)
--- a/compat/patches/02-ksize.patch
+++ b/compat/patches/02-ksize.patch
@@ -10,9 +10,9 @@ define ksize(bleh) SOME_LARGE_NUMBER
 but doing it this way emphasis careful review
 of the situation.
 
---- a/net/wireless/scan.c      2009-08-18 16:22:44.489362784 -0700
-+++ b/net/wireless/scan.c      2009-08-18 16:22:45.557376042 -0700
-@@ -407,7 +407,11 @@
+--- a/net/wireless/scan.c      2009-09-02 14:13:33.769092519 -0700
++++ b/net/wireless/scan.c      2009-09-02 14:13:34.925094548 -0700
+@@ -422,7 +422,11 @@
                        size_t used = dev->wiphy.bss_priv_size + sizeof(*res);
                        size_t ielen = res->pub.len_information_elements;
  

diff --git a/compat/patches/03-rfkill.patch b/compat/patches/03-rfkill.patch
index 1921b79ab4089c715661c0dbf8bbd8f9b53dfc2c..8e26503e1b52a93ed963a139eaa14e7096fc8e53 100644 (file)
--- a/compat/patches/03-rfkill.patch
+++ b/compat/patches/03-rfkill.patch
@@ -164,9 +164,9 @@ This would do the policing from within mac80211.
        rfkill_handler_exit();
  #endif
        misc_deregister(&rfkill_miscdev);
---- a/include/linux/rfkill_backport.h  2009-08-04 10:07:03.242018265 -0700
-+++ b/include/linux/rfkill_backport.h  2009-08-04 10:58:40.933996836 -0700
-@@ -23,6 +23,7 @@
+--- a/include/linux/rfkill_backport.h  2009-09-01 10:25:56.770413705 -0700
++++ b/include/linux/rfkill_backport.h  2009-09-02 14:14:12.045091842 -0700
+@@ -20,6 +20,7 @@
   */
  
  #include <linux/types.h>
@@ -174,7 +174,7 @@ This would do the policing from within mac80211.
  
  /* define userspace visible states */
  #define RFKILL_STATE_SOFT_BLOCKED     0
-@@ -148,7 +149,7 @@
+@@ -145,7 +146,7 @@
        int     (*set_block)(void *data, bool blocked);
  };
  
@@ -197,9 +197,9 @@ This would do the policing from within mac80211.
  #include <linux/workqueue.h>
  #include <net/genetlink.h>
  #include <net/cfg80211.h>
---- a/drivers/net/wireless/ath/ath9k/hw.c      2009-08-18 16:21:06.969354721 -0700
-+++ b/drivers/net/wireless/ath/ath9k/hw.c      2009-08-18 16:21:07.893353370 -0700
-@@ -3615,7 +3615,7 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c      2009-09-02 14:15:13.145121592 -0700
++++ b/drivers/net/wireless/ath/ath9k/hw.c      2009-09-02 14:15:14.289114759 -0700
+@@ -3643,7 +3643,7 @@
  
        pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;
  

diff --git a/compat/patches/08-rename-iwl4965-config.patch b/compat/patches/08-rename-iwl4965-config.patch
index 2a89bbe0a1b6118a035896e71a72acca57f55159..c6191f83c2298860892554ec093c938b279a7735 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-08-10 17:02:12.903465688 -0700
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c   2009-08-10 17:02:13.879468854 -0700
-@@ -3003,10 +3003,10 @@
+--- a/drivers/net/wireless/iwlwifi/iwl-agn.c   2009-09-02 14:16:08.061113710 -0700
++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c   2009-09-02 14:16:08.949100601 -0700
+@@ -3008,10 +3008,10 @@
  
  /* Hardware specific file defines the PCI IDs table for that hardware module */
  static struct pci_device_id iwl_hw_card_ids[] = {