compat-wireless: enable ath6kl from being included

ath6kl is not yet upstream but is on its way. For now just
display and copy ath6kl if its present on linux-next.git

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

diff --git a/Makefile b/Makefile
index e2041123d2d8e2eb37e4be5421f41aa24eca648a..b590ca2421da3fa5baafe70d830b058efb979600 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,12 @@ endif
 obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
 obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/
 
+
+ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
+obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/ath6kl/
+endif
+
+
 else
 
 export PWD :=  $(shell pwd)

diff --git a/config.mk b/config.mk
index 87b637e9d8bb20ee1ea0aa7f96ef9ca0af197b8b..458de29c5252afdf0d0476d3bce314b848b1ed89 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -196,6 +196,10 @@ ifneq ($(CONFIG_WIRELESS_EXT),)
  CONFIG_CFG80211_WEXT=y
 endif
 
+ifneq ($(CONFIG_STAGING),)
+CONFIG_COMPAT_STAGING=m
+endif
+
 # mac80211 test driver
 CONFIG_MAC80211_HWSIM=m
 
@@ -485,6 +489,21 @@ CONFIG_IWM=m
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_MRVL_SDIO=m
 
+ifneq ($(CONFIG_COMPAT_STAGING),)
+CONFIG_ATH6KL_CFG80211=y
+CONFIG_ATH6KL_DEBUG=y
+# CONFIG_ATH6KL_DISABLE_TARGET_DBGLOGS is not set
+# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
+# CONFIG_ATH6KL_ENABLE_HOST_DEBUG is not set
+CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
+# CONFIG_ATH6KL_HCI_BRIDGE is not set
+# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
+# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
+CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
+CONFIG_ATH6K_LEGACY=m
+endif
+
+
 endif # end of SDIO driver list
 
 # Common rt2x00 requirements

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 8ff2eceb2e19bfda9d410f36e6504da51bf84d56..e000faf0cf5dff88dc843fa7f7ff4fd467e2f530 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -210,6 +210,9 @@ DRIVERS="$DRIVERS drivers/net/wireless/wl12xx"
 DRIVERS="$DRIVERS drivers/net/wireless/iwmc3200wifi"
 DRIVERS="$DRIVERS drivers/net/wireless/orinoco"
 
+# Staging drivers
+STAGING_DRIVERS="drivers/staging/ath6kl"
+
 # Ethernet drivers
 DRIVERS="$DRIVERS drivers/net/atl1c"
 DRIVERS="$DRIVERS drivers/net/atl1e"
@@ -303,6 +306,20 @@ for i in $DRIVERS; do
        rm -f $i/*.mod.c
 done
 
+# Staging drivers in their own directory
+rm -rf drivers/staging/
+mkdir -p drivers/staging/
+for i in $STAGING_DRIVERS; do
+       if [ ! -d $GIT_TREE/$i ]; then
+               continue
+       fi
+       rm -rf $i
+       echo -e "Copying ${RED}STAGING${NORMAL} $GIT_TREE/$i/*.[ch]"
+       # staging drivers tend to have their own subdirs...
+       cp -a $GIT_TREE/$i drivers/staging/
+       rm -f $i/*.mod.c
+done
+
 for i in $DRIVERS_BT; do
        mkdir -p $i
        echo "Copying $GIT_TREE/$i/*.[ch]"

diff --git a/scripts/driver-select b/scripts/driver-select
index a88b08eb92a90a51c5286abac5a0f1b87a831b98..5f7d422aed72a1b2afbcdc04979ae8f4e8d5754b 100755 (executable)
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -31,6 +31,11 @@ CYAN="\033[36m"
 UNDERLINE="\033[02m"
 
 SUPPORTED_80211_DRIVERS="ath5k ath9k ath9k_htc ar9170 b43 zd1211rw rt2x00"
+
+if [ -d drivers/staging/ath6kl ]; then
+       SUPPORTED_80211_DRIVERS="$SUPPORTED_80211_DRIVERS ath6kl"
+fi
+
 # b43 needs some more work for driver-select, the SSB stuff, plus
 # what if you update b44 but not b43? It will bust.
 SUPPORTED_ETH_DRIVERS="atl1 atl2 atl1e atl1c"
@@ -309,6 +314,12 @@ case $1 in
                select_driver           CONFIG_ATH_COMMON
                select_ath9k_driver
                ;;
+       ath6kl)
+               disable_bt_usb_ethernet_var
+               select_driver           CONFIG_NOTHING
+               sed -e 's|net/mac80211/||' Makefile > Makefile.ath6kl
+               mv Makefile.ath6kl Makefile
+               ;;
        rtl818x)
                select_drivers          CONFIG_RTL8180 CONFIG_RTL8187
                disable_var_02