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

Commit b9217266 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'master-2014-11-04' of... 

Merge tag 'master-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next



John W. Linville says:

====================
pull request: wireless-next 2014-11-07

Please pull this batch of updates intended for the 3.19 stream!

For the mac80211 bits, Johannes says:

"This relatively large batch of changes is comprised of the following:
 * large mac80211-hwsim changes from Ben, Jukka and a bit myself
 * OCB/WAVE/11p support from Rostislav on behalf of the Czech Technical
   University in Prague and Volkswagen Group Research
 * minstrel VHT work from Karl
 * more CSA work from Luca
 * WMM admission control support in mac80211 (myself)
 * various smaller fixes, spelling corrections, and minor API additions"

For the Bluetooth bits, Johan says:

"Here's the first bluetooth-next pull request for 3.19. The vast majority
of patches are for ieee802154 from Alexander Aring with various fixes
and cleanups. There are also several LE/SMP fixes as well as improved
support for handling LE devices that have lost their pairing information
(the patches from Alfonso). Jukka provides a couple of stability fixes
for 6lowpan and Szymon conformance fixes for RFCOMM. For the HCI drivers
we have one new USB ID for an Acer controller as well as a reset
handling fix for H5."

For the Atheros bits, Kalle says:

"Major changes are:

o ethtool support (Ben)

o print dev string prefix with debug hex buffers dump (Michal)

o debugfs file to read calibration data from the firmware verification
  purposes (me)

o fix fw_stats debugfs file, now results are more reliable (Michal)

o firmware crash counters via debugfs (Ben&me)

o various tracing points to debug firmware (Rajkumar)

o make it possible to provide firmware calibration data via a file (me)

And we have quite a lot of smaller fixes and clean up."

For the iwlwifi bits, Emmanuel says:

"The big new thing here is netdetect which allows the
firmware to wake up the platform when a specific network
is detected. Along with that I have fixes for d3 operation.
The usual amount of rate scaling stuff - we now support STBC.
The other commit that stands out is Johannes's work on
devcoredump. He basically starts to use the standard
infrastructure he built."

Along with that are the usual sort of updates and such for ath9k,
brcmfmac, wil6210, and a handful of other bits here and there...

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e344458f bf515fb1

MAINTAINERS

+15 −0
Original line number Diff line number Diff line
@@ -2306,6 +2306,14 @@ F: security/capability.c 
F:	security/commoncap.c

F:	kernel/capability.c



CC2520 IEEE-802.15.4 RADIO DRIVER

M:	Varka Bhadram <varkabhadram@gmail.com>

L:	linux-wpan@vger.kernel.org

S:	Maintained

F:	drivers/net/ieee802154/cc2520.c

F:	include/linux/spi/cc2520.h

F:	Documentation/devicetree/bindings/net/ieee802154/cc2520.txt



CELL BROADBAND ENGINE ARCHITECTURE

M:	Arnd Bergmann <arnd@arndb.de>

L:	linuxppc-dev@lists.ozlabs.org
@@ -4693,6 +4701,13 @@ S: Maintained 
F:	net/ieee802154/

F:	net/mac802154/

F:	drivers/net/ieee802154/

F:	include/linux/nl802154.h

F:	include/linux/ieee802154.h

F:	include/net/nl802154.h

F:	include/net/mac802154.h

F:	include/net/af_ieee802154.h

F:	include/net/cfg802154.h

F:	include/net/ieee802154_netdev.h

F:	Documentation/networking/ieee802154.txt



IGUANAWORKS USB IR TRANSCEIVER

drivers/bcma/bcma_private.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct bcma_bus; 
/* main.c */

bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,

		     int timeout);

void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core);

int bcma_bus_register(struct bcma_bus *bus);

void bcma_bus_unregister(struct bcma_bus *bus);

int __init bcma_bus_early_register(struct bcma_bus *bus,

drivers/bcma/main.c

+6 −3
Original line number Diff line number Diff line
@@ -169,10 +169,8 @@ static void bcma_of_fill_device(struct platform_device *parent, 
}

#endif /* CONFIG_OF */



static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)

void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)

{

	int err;



	core->dev.release = bcma_release_core_dev;

	core->dev.bus = &bcma_bus_type;

	dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
@@ -196,6 +194,11 @@ static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core) 
	case BCMA_HOSTTYPE_SDIO:

		break;

	}

}



static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)

{

	int err;



	err = device_register(&core->dev);

	if (err) {

drivers/bcma/scan.c

+1 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ int bcma_bus_scan(struct bcma_bus *bus) 
		bus->nr_cores++;

		other_core = bcma_find_core_reverse(bus, core->id.id);

		core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;

		bcma_prepare_core(bus, core);



		bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",

			  core->core_index, bcma_device_name(&core->id),

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0489, 0xe057) },

	{ USB_DEVICE(0x0489, 0xe056) },

	{ USB_DEVICE(0x0489, 0xe05f) },

	{ USB_DEVICE(0x0489, 0xe078) },

	{ USB_DEVICE(0x04c5, 0x1330) },

	{ USB_DEVICE(0x04CA, 0x3004) },

	{ USB_DEVICE(0x04CA, 0x3005) },
@@ -130,6 +131,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },