Revert "compat-wireless: apply changes needed after wl1271->wl12xx renaming"

Not yet

This reverts commit 3bd28daf2ad78adf652c3e6b74645b7fa0cf3fc2.

diff --git a/Makefile b/Makefile
index aab3cdf7ff5f7a112574eb3c513e3b8d2fa18f87..db9c83679fa3236f9e4a6e61b351f11567ed9d09 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -276,7 +276,7 @@ install-scripts:
        @$(MODPROBE) -l usb8xxx
        @$(MODPROBE) -l usbnet
        @$(MODPROBE) -l wl1251
-       @$(MODPROBE) -l wl12xx
+       @$(MODPROBE) -l wl1271
        @$(MODPROBE) -l zd1211rw
        @echo
        @echo "Currently detected ethernet subsystem modules:"
@@ -405,7 +405,7 @@ uninstall:
        @$(MODPROBE) -l usb8xxx
        @$(MODPROBE) -l usbnet
        @$(MODPROBE) -l wl1251
-       @$(MODPROBE) -l wl12xx
+       @$(MODPROBE) -l wl1271
        @$(MODPROBE) -l zd1211rw
        @echo
        @echo "Your old ethernet subsystem modules are left intact:"

diff --git a/README b/README
index d1c7884ba1750eced06420040398d052cff935f3..d5372902e1203fa644cafb69bebdf83398af380d 100644 (file)
--- a/README
+++ b/README
@@ -162,7 +162,7 @@ rtl8187
 spectrum_cs
 ssb
 wl1251
-wl12xx
+wl1271
 zd1211rw
 
 This package also provides more drivers which may be documented here

diff --git a/patches/06-header-changes.patch b/patches/06-header-changes.patch
index 8d06c911909b88ec5d948a7a77e6ad2450d29661..1ab2b278e3bfe99b1e99590c2f42c54b1cce582b 100644 (file)
--- a/patches/06-header-changes.patch
+++ b/patches/06-header-changes.patch
@@ -50,8 +50,8 @@ cases.
  #include <linux/spi/spi.h>
  #include <linux/wl12xx.h>
  
---- a/drivers/net/wireless/wl12xx/boot.c
-+++ b/drivers/net/wireless/wl12xx/boot.c
+--- a/drivers/net/wireless/wl12xx/wl1271_boot.c
++++ b/drivers/net/wireless/wl12xx/wl1271_boot.c
 @@ -21,7 +21,6 @@
   *
   */

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index f84da2cd67143e09959bfe9268b3af8de0d629ad..aa6fc2a7df9fb318838dacf24cc74bcba74ce433 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -499,8 +499,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  }
  
  static void rtl8187_configure_filter(struct ieee80211_hw *dev,
---- a/drivers/net/wireless/wl12xx/main.c
-+++ b/drivers/net/wireless/wl12xx/main.c
+--- a/drivers/net/wireless/wl12xx/wl1271_main.c
++++ b/drivers/net/wireless/wl12xx/wl1271_main.c
 @@ -1410,11 +1410,20 @@ struct wl1271_filter_params {
        u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN];
  };

diff --git a/scripts/driver-select b/scripts/driver-select
index 611e6e1040bb1e2dfb3a82b9c86b7abbcae6f3a2..ef2b9a73e15515e92bd975b7247698d2900fd102 100755 (executable)
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -30,7 +30,7 @@ PURPLE="\033[35m"
 CYAN="\033[36m"
 UNDERLINE="\033[02m"
 
-SUPPORTED_80211_DRIVERS="ath5k ath9k ath9k_htc carl9170 b43 zd1211rw rt2x00 wl1251 wl12xx"
+SUPPORTED_80211_DRIVERS="ath5k ath9k ath9k_htc carl9170 b43 zd1211rw rt2x00 wl1251 wl1271"
 
 if [ -d drivers/staging/ath6kl ]; then
        SUPPORTED_80211_DRIVERS="$SUPPORTED_80211_DRIVERS ath6kl"
@@ -60,7 +60,7 @@ function usage {
        echo -e "\t${CYAN}intel${NORMAL} < ${PURPLE} iwl3945 iwlagn ipw2100 ipw2200 ${NORMAL}>"
        echo -e "\t${CYAN}iwlwifi${NORMAL} < ${PURPLE} iwl3945 iwlagn ${NORMAL}>"
        echo -e "\t${CYAN}rtl818x${NORMAL} < ${PURPLE} rtl8180 rtl8187 ${NORMAL}>"
-       echo -e "\t${CYAN}wl12xx${NORMAL} < ${PURPLE} wl1251 wl12xx (SPI and SDIO)${NORMAL}>"
+       echo -e "\t${CYAN}wl12xx${NORMAL} < ${PURPLE} wl1251 wl1271 (SPI and SDIO)${NORMAL}>"
        
        echo -e "\nSupported group drivers: Bluetooth & Ethernet:"
        echo -e "\t${BLUE}atlxx${NORMAL} < ${PURPLE} atl1 atl2 atl1e atl1c ${NORMAL}>"
@@ -398,7 +398,7 @@ case $1 in
                disable_staging
                disable_var_01
                ;;
-       wl12xx)
+       wl1271)
                select_drivers          CONFIG_WL12XX
                disable_staging
                disable_var_01

diff --git a/scripts/unload.sh b/scripts/unload.sh
index 52ad5511a276413495180c052524f1ca54241298..b7fd8cb087a028d9eaa0957661fef6a1f5d60c01 100755 (executable)
--- a/scripts/unload.sh
+++ b/scripts/unload.sh
@@ -8,7 +8,7 @@ OLD_MODULES="$OLD_MODULES ieee80211softmac ieee80211_crypt ieee80211"
 OLD_MODULES="$OLD_MODULES bcm43xx rndis_wext iwl4965"
 MODULES="$OLD_MODULES"
 MODULES="$MODULES ipw2100 ipw2200 libipw"
-MODULES="$MODULES wl1251 wl12xx iwmc3200wifi"
+MODULES="$MODULES wl1251 wl1271 iwmc3200wifi"
 MODULES="$MODULES libertas_cs usb8xxx libertas libertas_sdio libertas_spi"
 MODULES="$MODULES libertas_tf libertas_tf_usb"
 MODULES="$MODULES adm8211 zd1211rw"

diff --git a/scripts/wlunload.sh b/scripts/wlunload.sh
index ca7e429f95699c432fdc270d2f03fdd8c09aa87c..8add614ef18d86cbe0aae92f5e7ef774e13e9bad 100755 (executable)
--- a/scripts/wlunload.sh
+++ b/scripts/wlunload.sh
@@ -8,7 +8,7 @@ OLD_MODULES="$OLD_MODULES ieee80211softmac ieee80211_crypt ieee80211"
 OLD_MODULES="$OLD_MODULES bcm43xx rndis_wext iwl4965"
 MODULES="$OLD_MODULES"
 MODULES="$MODULES ipw2100 ipw2200 libipw"
-MODULES="$MODULES wl1251 wl12xx iwmc3200wifi"
+MODULES="$MODULES wl1251 wl1271 iwmc3200wifi"
 MODULES="$MODULES libertas_cs usb8xxx libertas libertas_sdio libertas_spi"
 MODULES="$MODULES libertas_tf libertas_tf_usb"
 MODULES="$MODULES adm8211 zd1211rw"