From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Wed, 13 Jun 2012 01:41:51 +0000 (-0700)
Subject: compat-wireless: address intel wireless driver file rename
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a3c7589c771344cba8d2d541838afdda64def1d3;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: address intel wireless driver file rename

I like dark beers, and amber beers... Just saying.

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
---

diff --git a/config.mk b/config.mk
index bc0296fab693..14cddc780505 100644
--- a/config.mk
+++ b/config.mk
@@ -280,6 +280,7 @@ export CONFIG_ATH5K_PCI=y
 export CONFIG_ATH9K_PCI=y
 
 export CONFIG_IWLWIFI=m
+export CONFIG_IWLDVM=m
 export CONFIG_IWLWIFI_P2P=y
 # export CONFIG_IWLWIFI_DEBUG=y
 # export CONFIG_IWLWIFI_DEBUGFS=y
diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index a463baacb991..29311f1274a6 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -215,8 +215,8 @@ calls on compat code with only slight modifications.
  
  #define IL_LEGACY_PM_OPS	(&il_pm_ops)
  
---- a/drivers/net/wireless/iwlwifi/iwl-pci.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
+--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
++++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
 @@ -338,6 +338,9 @@ static int iwl_pci_resume(struct device
  
  static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
diff --git a/patches/38-led-max-brightness.patch b/patches/38-led-max-brightness.patch
index 9bb86ac7023d..86fba7e1c9d8 100644
--- a/patches/38-led-max-brightness.patch
+++ b/patches/38-led-max-brightness.patch
@@ -10,8 +10,8 @@
  
  	switch (mode) {
  	case IL_LED_DEFAULT:
---- a/drivers/net/wireless/iwlwifi/iwl-led.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
+--- a/drivers/net/wireless/iwlwifi/dvm/led.c
++++ b/drivers/net/wireless/iwlwifi/dvm/led.c
 @@ -188,7 +188,9 @@ void iwl_leds_init(struct iwl_priv *priv
  				   wiphy_name(priv->hw->wiphy));
  	priv->led.brightness_set = iwl_led_brightness_set;
diff --git a/patches/39-remove_blink_set.patch b/patches/39-remove_blink_set.patch
index b5cb65ca618c..746a455b8679 100644
--- a/patches/39-remove_blink_set.patch
+++ b/patches/39-remove_blink_set.patch
@@ -26,8 +26,8 @@
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
  	il->led.max_brightness = 1;
  #endif
---- a/drivers/net/wireless/iwlwifi/iwl-led.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
+--- a/drivers/net/wireless/iwlwifi/dvm/led.c
++++ b/drivers/net/wireless/iwlwifi/dvm/led.c
 @@ -163,6 +163,7 @@ static void iwl_led_brightness_set(struc
  	iwl_led_cmd(priv, on, 0);
  }
diff --git a/patches/53-pr_fmt.patch b/patches/53-pr_fmt.patch
index 874e75647605..74b41c10ca71 100644
--- a/patches/53-pr_fmt.patch
+++ b/patches/53-pr_fmt.patch
@@ -780,8 +780,8 @@ compiler warnings. This is going to be sent upstream.
  #include "htc.h"
  
  MODULE_AUTHOR("Atheros Communications");
---- a/drivers/net/wireless/iwlwifi/iwl-agn.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
+--- a/drivers/net/wireless/iwlwifi/dvm/main.c
++++ b/drivers/net/wireless/iwlwifi/dvm/main.c
 @@ -27,8 +27,10 @@
   *
   *****************************************************************************/
@@ -793,8 +793,8 @@ compiler warnings. This is going to be sent upstream.
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/init.h>
---- a/drivers/net/wireless/iwlwifi/iwl-pci.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
+--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
++++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
 @@ -61,8 +61,10 @@
   *
   *****************************************************************************/
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index be564ccf7764..ebccf81d32da 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -233,6 +233,8 @@ DRIVERS="$DRIVERS drivers/net/wireless/brcm80211/brcmutil"
 DRIVERS="$DRIVERS drivers/net/wireless/brcm80211/include"
 DRIVERS="$DRIVERS drivers/net/wireless/iwlegacy"
 DRIVERS="$DRIVERS drivers/net/wireless/iwlwifi"
+DRIVERS="$DRIVERS drivers/net/wireless/iwlwifi/pcie"
+DRIVERS="$DRIVERS drivers/net/wireless/iwlwifi/dvm"
 DRIVERS="$DRIVERS drivers/net/wireless/rt2x00"
 DRIVERS="$DRIVERS drivers/net/wireless/zd1211rw"
 DRIVERS="$DRIVERS drivers/net/wireless/libertas"