Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb00ec38 authored by John W. Linville's avatar John W. Linville
Browse files

ath6kl: revert USB support 



The ath6kl driver is causing build failures when the ath6kl bits are
not built as modules.  A better fix is forthcoming in a future release,
but for now lets revert the problematic code.

This reverts the following commits:

	fde57764
	d70385a2
	59d954dd

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 00e8e692

drivers/net/wireless/ath/ath6kl/Kconfig

+4 −21
Original line number Diff line number Diff line 
config ATH6KL

	tristate "Atheros mobile chipsets support"



config ATH6KL_SDIO

	tristate "Atheros ath6kl SDIO support"

	depends on ATH6KL

	tristate "Atheros ath6kl support"

	depends on MMC

	depends on CFG80211

	---help---

	  This module adds support for wireless adapters based on

	  Atheros AR6003 and AR6004 chipsets running over SDIO. If you

	  choose to build it as a module, it will be called ath6kl_sdio.

	  Please note that AR6002 and AR6001 are not supported by this

	  driver.



config ATH6KL_USB

	tristate "Atheros ath6kl USB support"

	depends on ATH6KL

	depends on USB

	depends on CFG80211

	depends on EXPERIMENTAL

	---help---

	  This module adds support for wireless adapters based on

	  Atheros AR6004 chipset running over USB. This is still under

	  implementation and it isn't functional. If you choose to

	  build it as a module, it will be called ath6kl_usb.

	  Atheros AR6003 chipset running over SDIO. If you choose to

	  build it as a module, it will be called ath6kl. Pls note

	  that AR6002 and AR6001 are not supported by this driver.



config ATH6KL_DEBUG

	bool "Atheros ath6kl debugging"

drivers/net/wireless/ath/ath6kl/Makefile

+12 −25
Original line number Diff line number Diff line
@@ -21,30 +21,17 @@ 
# Author(s): ="Atheros"

#------------------------------------------------------------------------------



obj-$(CONFIG_ATH6KL_SDIO) := ath6kl_sdio.o

ath6kl_sdio-y += debug.o

ath6kl_sdio-y += hif.o

ath6kl_sdio-y += htc.o

ath6kl_sdio-y += bmi.o

ath6kl_sdio-y += cfg80211.o

ath6kl_sdio-y += init.o

ath6kl_sdio-y += main.o

ath6kl_sdio-y += txrx.o

ath6kl_sdio-y += wmi.o

ath6kl_sdio-y += sdio.o

ath6kl_sdio-$(CONFIG_NL80211_TESTMODE) += testmode.o



obj-$(CONFIG_ATH6KL_USB) += ath6kl_usb.o

ath6kl_usb-y += debug.o

ath6kl_usb-y += hif.o

ath6kl_usb-y += htc.o

ath6kl_usb-y += bmi.o

ath6kl_usb-y += cfg80211.o

ath6kl_usb-y += init.o

ath6kl_usb-y += main.o

ath6kl_usb-y += txrx.o

ath6kl_usb-y += wmi.o

ath6kl_usb-y += usb.o

ath6kl_usb-$(CONFIG_NL80211_TESTMODE) += testmode.o

obj-$(CONFIG_ATH6KL) := ath6kl.o

ath6kl-y += debug.o

ath6kl-y += hif.o

ath6kl-y += htc.o

ath6kl-y += bmi.o

ath6kl-y += cfg80211.o

ath6kl-y += init.o

ath6kl-y += main.o

ath6kl-y += txrx.o

ath6kl-y += wmi.o

ath6kl-y += sdio.o

ath6kl-$(CONFIG_NL80211_TESTMODE) += testmode.o



ccflags-y += -D__CHECK_ENDIAN__

drivers/net/wireless/ath/ath6kl/bmi.c

+2 −8
Original line number Diff line number Diff line
@@ -57,14 +57,8 @@ int ath6kl_bmi_get_target_info(struct ath6kl *ar, 
		return ret;

	}



	if (ar->hif_type == ATH6KL_HIF_TYPE_USB) {

		ret = ath6kl_hif_bmi_read(ar, (u8 *)targ_info,

					  sizeof(*targ_info));

	} else {

	ret = ath6kl_hif_bmi_read(ar, (u8 *)&targ_info->version,

				  sizeof(targ_info->version));

	}



	if (ret) {

		ath6kl_err("Unable to recv target info: %d\n", ret);

		return ret;

drivers/net/wireless/ath/ath6kl/debug.h

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ enum ATH6K_DEBUG_MASK { 
	ATH6KL_DBG_BOOT		= BIT(18),    /* driver init and fw boot */

	ATH6KL_DBG_WMI_DUMP	= BIT(19),

	ATH6KL_DBG_SUSPEND	= BIT(20),

	ATH6KL_DBG_USB		= BIT(21),

	ATH6KL_DBG_ANY	        = 0xffffffff  /* enable all logs */

};

drivers/net/wireless/ath/ath6kl/hif.c

+0 −5
Original line number Diff line number Diff line
@@ -689,11 +689,6 @@ int ath6kl_hif_setup(struct ath6kl_device *dev) 
	ath6kl_dbg(ATH6KL_DBG_HIF, "hif block size %d mbox addr 0x%x\n",

		   dev->htc_cnxt->block_sz, dev->ar->mbox_info.htc_addr);



	/* usb doesn't support enabling interrupts */

	/* FIXME: remove check once USB support is implemented */

	if (dev->ar->hif_type == ATH6KL_HIF_TYPE_USB)

		return 0;



	status = ath6kl_hif_disable_intrs(dev);



fail_setup: