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

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

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
parents faa85aa2 dc0d633e

drivers/bluetooth/btusb.c

+3 −7
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static struct usb_device_id btusb_table[] = { 
	{ USB_DEVICE(0x0c10, 0x0000) },



	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0a5c, 0x21e3) },

	{ USB_DEVICE(0x413c, 0x8197) },



	{ }	/* Terminating entry */
@@ -508,15 +509,10 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags) 


	pipe = usb_rcvisocpipe(data->udev, data->isoc_rx_ep->bEndpointAddress);



	urb->dev      = data->udev;

	urb->pipe     = pipe;

	urb->context  = hdev;

	urb->complete = btusb_isoc_complete;

	urb->interval = data->isoc_rx_ep->bInterval;

	usb_fill_int_urb(urb, data->udev, pipe, buf, size, btusb_isoc_complete,

				hdev, data->isoc_rx_ep->bInterval);



	urb->transfer_flags  = URB_FREE_BUFFER | URB_ISO_ASAP;

	urb->transfer_buffer = buf;

	urb->transfer_buffer_length = size;



	__fill_isoc_descriptor(urb, size,

			le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize));

drivers/net/wireless/ath/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ ath-objs := main.o \ 
		key.o



ath-$(CONFIG_ATH_DEBUG) += debug.o

ccflags-y += -D__CHECK_ENDIAN__

drivers/net/wireless/ath/ath.h

+5 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ enum ATH_DEBUG { 


#define ath_dbg(common, dbg_mask, fmt, ...)				\

do {									\

	if ((common)->debug_mask & dbg_mask)				\

	if ((common)->debug_mask & ATH_DBG_##dbg_mask)			\

		_ath_printk(KERN_DEBUG, common, fmt, ##__VA_ARGS__);	\

} while (0)
@@ -265,10 +265,13 @@ do { \ 
#else



static inline  __attribute__ ((format (printf, 3, 4)))

void ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask,

void _ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask,

	     const char *fmt, ...)

{

}

#define ath_dbg(common, dbg_mask, fmt, ...)				\

	_ath_dbg(common, ATH_DBG_##dbg_mask, fmt, ##__VA_ARGS__)



#define ATH_DBG_WARN(foo, arg...) do {} while (0)

#define ATH_DBG_WARN_ON_ONCE(foo) ({				\

	int __ret_warn_once = !!(foo);				\

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"

drivers/net/wireless/ath/ath6kl/Makefile

+25 −12
Original line number Diff line number Diff line
@@ -21,17 +21,30 @@ 
# 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_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



ccflags-y += -D__CHECK_ENDIAN__