Update hunk offsets for 03-rfkill.patch
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 6 Oct 2009 16:57:40 +0000 (12:57 -0400)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 6 Oct 2009 16:57:40 +0000 (12:57 -0400)
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
compat/patches/03-rfkill.patch

index cfd07ca8d4bd7eef866df5dbd4673b2a88971ad9..bbb2c954e0b197510097f2be2fa8c336c145c03a 100644 (file)
@@ -63,18 +63,18 @@ This would do the policing from within mac80211.
  
        /* causes rfkill_start() to be called */
        error = input_register_handle(handle);
---- 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
+--- a/net/rfkill/core.c        2009-10-06 12:53:52.000000000 -0400
++++ b/net/rfkill/core.c        2009-10-06 12:53:53.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <linux/capability.h>
  #include <linux/list.h>
  #include <linux/mutex.h>
 -#include <linux/rfkill.h>
 +#include <linux/rfkill_backport.h>
+ #include <linux/sched.h>
  #include <linux/spinlock.h>
  #include <linux/miscdevice.h>
- #include <linux/wait.h>
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
        const struct rfkill_ops *ops;
        void                    *data;
  
@@ -83,7 +83,7 @@ This would do the policing from within mac80211.
        struct led_trigger      led_trigger;
        const char              *ledtrigname;
  #endif
-@@ -122,7 +122,7 @@
+@@ -123,7 +123,7 @@
  static bool rfkill_epo_lock_active;
  
  
@@ -92,7 +92,7 @@ This would do the policing from within mac80211.
  static void rfkill_led_trigger_event(struct rfkill *rfkill)
  {
        struct led_trigger *trigger;
-@@ -316,7 +316,7 @@
+@@ -317,7 +317,7 @@
        rfkill_event(rfkill);
  }
  
@@ -101,7 +101,7 @@ This would do the policing from within mac80211.
  static atomic_t rfkill_input_disabled = ATOMIC_INIT(0);
  
  /**
-@@ -776,7 +776,7 @@
+@@ -777,7 +777,7 @@
  }
  
  static struct class rfkill_class = {
@@ -110,7 +110,7 @@ This would do the policing from within mac80211.
        .dev_release    = rfkill_release,
        .dev_attrs      = rfkill_dev_attrs,
        .dev_uevent     = rfkill_dev_uevent,
-@@ -922,7 +922,7 @@
+@@ -923,7 +923,7 @@
        if (!rfkill->persistent || rfkill_epo_lock_active) {
                schedule_work(&rfkill->sync_work);
        } else {
@@ -119,7 +119,7 @@ This would do the policing from within mac80211.
                bool soft_blocked = !!(rfkill->state & RFKILL_BLOCK_SW);
  
                if (!atomic_read(&rfkill_input_disabled))
-@@ -1150,7 +1150,7 @@
+@@ -1151,7 +1151,7 @@
        list_for_each_entry_safe(ev, tmp, &data->events, list)
                kfree(ev);
  
@@ -128,7 +128,7 @@ This would do the policing from within mac80211.
        if (data->input_handler)
                if (atomic_dec_return(&rfkill_input_disabled) == 0)
                        printk(KERN_DEBUG "rfkill: input handler enabled\n");
-@@ -1161,7 +1161,7 @@
+@@ -1162,7 +1162,7 @@
        return 0;
  }
  
@@ -137,7 +137,7 @@ This would do the policing from within mac80211.
  static long rfkill_fop_ioctl(struct file *file, unsigned int cmd,
                             unsigned long arg)
  {
-@@ -1193,7 +1193,7 @@
+@@ -1194,7 +1194,7 @@
        .write          = rfkill_fop_write,
        .poll           = rfkill_fop_poll,
        .release        = rfkill_fop_release,
@@ -146,7 +146,7 @@ This would do the policing from within mac80211.
        .unlocked_ioctl = rfkill_fop_ioctl,
        .compat_ioctl   = rfkill_fop_ioctl,
  #endif
-@@ -1223,7 +1223,7 @@
+@@ -1224,7 +1224,7 @@
                goto out;
        }
  
@@ -155,7 +155,7 @@ This would do the policing from within mac80211.
        error = rfkill_handler_init();
        if (error) {
                misc_deregister(&rfkill_miscdev);
-@@ -1239,7 +1239,7 @@
+@@ -1240,7 +1240,7 @@
  
  static void __exit rfkill_exit(void)
  {
@@ -206,9 +206,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-09-23 10:28:55.875708257 -0700
-+++ b/drivers/net/wireless/ath/ath9k/hw.c      2009-09-23 10:28:56.211707588 -0700
-@@ -3666,7 +3666,7 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c      2009-10-06 12:55:01.000000000 -0400
++++ b/drivers/net/wireless/ath/ath9k/hw.c      2009-10-06 12:55:02.000000000 -0400
+@@ -3675,7 +3675,7 @@
  
        pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;