compat-drivers: add the iwlwifi MVM driver

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/config.mk b/config.mk
index d0f2e0b4c60c5d41b472d5cfc3ab2d53ac294296..add66c7b7eab0a566ad1381d67a748ec29c08bae 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -300,6 +300,7 @@ endif #CONFIG_COMPAT_KERNEL_2_6_31
 
 export CONFIG_IWLWIFI=m
 export CONFIG_IWLDVM=m
+export CONFIG_IWLMVM=m
 export CONFIG_IWLWIFI_P2P=y
 # export CONFIG_IWLWIFI_DEBUG=y
 # export CONFIG_IWLWIFI_DEBUGFS=y

diff --git a/patches/collateral-evolutions/network/38-led-max-brightness.patch b/patches/collateral-evolutions/network/38-led-max-brightness.patch
index fa0dee71b0e627a118eadfcdd3e69a7510f2f255..1495815c09db84bb6bfa8cd920738d3cc6b6ad4e 100644 (file)
--- a/patches/collateral-evolutions/network/38-led-max-brightness.patch
+++ b/patches/collateral-evolutions/network/38-led-max-brightness.patch
@@ -22,3 +22,15 @@
  
        switch (mode) {
        case IWL_LED_DEFAULT:
+--- a/drivers/net/wireless/iwlwifi/mvm/led.c
++++ b/drivers/net/wireless/iwlwifi/mvm/led.c
+@@ -108,7 +108,9 @@ int iwl_mvm_leds_init(struct iwl_mvm *mv
+       mvm->led.name = kasprintf(GFP_KERNEL, "%s-led",
+                                  wiphy_name(mvm->hw->wiphy));
+       mvm->led.brightness_set = iwl_led_brightness_set;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
+       mvm->led.max_brightness = 1;
++#endif
+ 
+       if (mode == IWL_LED_RF_STATE)
+               mvm->led.default_trigger =

diff --git a/patches/collateral-evolutions/network/67-ipv6-dev-list.patch b/patches/collateral-evolutions/network/67-ipv6-dev-list.patch
new file mode 100644 (file)
index 0000000..7af6382
--- /dev/null
+++ b/patches/collateral-evolutions/network/67-ipv6-dev-list.patch
@@ -0,0 +1,22 @@
+This backports:
+
+commit 502a2ffd7376ae27cfde6172257db0ff9d8cfec2
+Author: stephen hemminger <shemminger@vyatta.com>
+Date:   Wed Mar 17 20:31:13 2010 +0000
+
+    ipv6: convert idev_list to list macros
+
+--- a/drivers/net/wireless/iwlwifi/mvm/d3.c
++++ b/drivers/net/wireless/iwlwifi/mvm/d3.c
+@@ -98,7 +98,11 @@ void iwl_mvm_ipv6_addr_change(struct iee
+       int idx = 0;
+ 
+       read_lock(&idev->lock);
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+       list_for_each_entry(ifa, &idev->addr_list, if_list) {
++#else
++      for (ifa = idev->addr_list; ifa; ifa = ifa->if_next) {
++#endif
+               mvmvif->target_ipv6_addrs[idx] = ifa->addr;
+               idx++;
+               if (idx >= IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS)

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 73f0ceabef52b387c9330f742c1d40f7e84e2ba5..48055a92cfa26687a53819dc3732521ba33e99f4 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -353,6 +353,7 @@ DRIVERS_WLAN="drivers/net/wireless/ath
              drivers/net/wireless/iwlwifi
              drivers/net/wireless/iwlwifi/pcie
              drivers/net/wireless/iwlwifi/dvm
+             drivers/net/wireless/iwlwifi/mvm
              drivers/net/wireless/rt2x00
              drivers/net/wireless/zd1211rw
              drivers/net/wireless/libertas