Merge branch 'for-linville' of git://github.com/kvalo/ath6kl (b9d90578) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/net/wireless/ath/ath6kl/Kconfig

+21 −4

Original line number	Diff line number	Diff line
		config ATH6KL
		tristate "Atheros ath6kl support"
		tristate "Atheros mobile chipsets support"

		config ATH6KL_SDIO
		tristate "Atheros ath6kl SDIO support"
		depends on ATH6KL
		depends on MMC
		depends on CFG80211
		---help---
		This module adds support for wireless adapters based on
		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.
		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.

		config ATH6KL_DEBUG
		bool "Atheros ath6kl debugging"

+17 −13

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

		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
		obj-$(CONFIG_ATH6KL) += ath6kl_core.o
		ath6kl_core-y += debug.o
		ath6kl_core-y += hif.o
		ath6kl_core-y += htc.o
		ath6kl_core-y += bmi.o
		ath6kl_core-y += cfg80211.o
		ath6kl_core-y += init.o
		ath6kl_core-y += main.o
		ath6kl_core-y += txrx.o
		ath6kl_core-y += wmi.o
		ath6kl_core-y += core.o
		ath6kl_core-$(CONFIG_NL80211_TESTMODE) += testmode.o

		ccflags-y += -D__CHECK_ENDIAN__
		obj-$(CONFIG_ATH6KL_SDIO) += ath6kl_sdio.o
		ath6kl_sdio-y += sdio.o

		obj-$(CONFIG_ATH6KL_USB) += ath6kl_usb.o
		ath6kl_usb-y += usb.o

+8 −2

Original line number	Diff line number	Diff line
		@@ -57,8 +57,14 @@ 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;

+403 −203

File changed.

Preview size limit exceeded, changes collapsed.

+8 −4

Original line number	Diff line number	Diff line
		@@ -27,10 +27,6 @@ enum ath6kl_cfg_suspend_mode {
		struct net_device ath6kl_interface_add(struct ath6kl ar, char *name,
		enum nl80211_iftype type,
		u8 fw_vif_idx, u8 nw_type);
		int ath6kl_register_ieee80211_hw(struct ath6kl *ar);
		struct ath6kl ath6kl_core_alloc(struct device dev);
		void ath6kl_deinit_ieee80211_hw(struct ath6kl *ar);

		void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted);

		void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,
		@@ -53,7 +49,15 @@ int ath6kl_cfg80211_suspend(struct ath6kl *ar,

		int ath6kl_cfg80211_resume(struct ath6kl *ar);

		void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif);

		void ath6kl_cfg80211_stop(struct ath6kl_vif *vif);
		void ath6kl_cfg80211_stop_all(struct ath6kl *ar);

		int ath6kl_cfg80211_init(struct ath6kl *ar);
		void ath6kl_cfg80211_cleanup(struct ath6kl *ar);

		struct ath6kl *ath6kl_cfg80211_create(void);
		void ath6kl_cfg80211_destroy(struct ath6kl *ar);

		#endif /* ATH6KL_CFG80211_H */