move libertas ml_priv compat stuff to 01-netdev.patch

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

diff --git a/compat/compat.diff b/compat/compat.diff
index 5ec146a70917d2829da9b8b2df3cf80dd2ad9476..b147fab129343b4e39dc8d231b1fd64b786eaa5a 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -290,23 +290,6 @@
 -      zd_chip_control_leds(&mac->chip, LED_OFF);
 +      zd_chip_control_leds(&mac->chip, ZD_LED_OFF);
  }
---- a/drivers/net/wireless/libertas/defs.h     2009-07-08 14:04:29.692256519 -0700
-+++ b/drivers/net/wireless/libertas/defs.h     2009-07-08 14:03:26.712279246 -0700
-@@ -16,6 +16,14 @@
- #define DRV_NAME "libertas"
- #endif
- 
-+/*
-+ * Really nasty hack to avoid stuffing compat.diff with tons of ifdefs,
-+ * we could add this to a compat header file but too lazy to check ml_priv
-+ * is not used anywhere else
-+ */
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
-+#define ml_priv priv
-+#endif
- 
- #define LBS_DEB_ENTER 0x00000001
- #define LBS_DEB_LEAVE 0x00000002
 --- a/net/wireless/nl80211.c   2009-07-27 16:22:30.301045695 -0700
 +++ b/net/wireless/nl80211.c   2009-07-27 18:17:28.445046102 -0700
 @@ -29,7 +29,9 @@

diff --git a/compat/diffs/01-netdev.patch b/compat/diffs/01-netdev.patch
index 5f5b4d3755d5834bb4353c7feca1e175c5ce7aed..090f30862a0b86356fe84473f18d1a8253ff9c0d 100644 (file)
--- a/compat/diffs/01-netdev.patch
+++ b/compat/diffs/01-netdev.patch
@@ -484,6 +484,23 @@
        rtap_dev->ml_priv = priv;
        SET_NETDEV_DEV(rtap_dev, priv->dev->dev.parent);
  
+--- a/drivers/net/wireless/libertas/defs.h     2009-07-08 14:04:29.692256519 -0700
++++ b/drivers/net/wireless/libertas/defs.h     2009-07-08 14:03:26.712279246 -0700
+@@ -16,6 +16,14 @@
+ #define DRV_NAME "libertas"
+ #endif
+ 
++/*
++ * Really nasty hack to avoid stuffing compat.diff with tons of ifdefs,
++ * we could add this to a compat header file but too lazy to check ml_priv
++ * is not used anywhere else
++ */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
++#define ml_priv priv
++#endif
+ 
+ #define LBS_DEB_ENTER 0x00000001
+ #define LBS_DEB_LEAVE 0x00000002
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
 @@ -814,16 +814,22 @@ static struct device_driver mac80211_hwsim_driver = {