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

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



John W. Linville says:

====================
I would guess that this is the last big wireless pull request before
the 3.11 merge window...

Regarding the mac80211 bits, Johannes says:

"I have a number of mesh fixes and improvements from Colleen, Jacob,
Ashok and Thomas, powersave fixes in mac80211 from Alex, improved
management-TX from Antonio, and a few various things, including locking
fixes, from others and myself. Overall though, nothing really stands
out."

As for the iwlwifi bits, Johannes says:

"Emmanuel contributed two AP mode fixes, removed an unused field, fixed a
comment and added a warning for something that shouldn't happen in
practice, and I removed the declaration of a function that doesn't even
exist and cleaned up a small include."

"This time I have a number of cleanups, a small fix from Emmanuel and two
performance improvements that combined reduce our driver's CPU
utilisation as much as 75% in high TX-throughput scenarios."

"These two patches fix two issues with using rfkill randomly during
traffic, which would then cause our driver to stop working and not be
able to recover at all."

Regarding the ath6kl bits, Kalle says:

"Here are few simple patches for ath6kl. We have a suspend crash fix for
USB from Shafi, use of mac_pton(), a compiler warning fix and a fix for
module initialisation error path."

Kalle also sends the biggest single item of note, the new ath10k
driver for Qualcomm Atheros 802.11ac CQA98xx devices.

Included is an NFC pull, of which Samuel says:

"These are the pending NFC patches for the 3.11 merge window.

It contains the pending fixes that were on nfc-fixes (nfc-fixes-3.10-2),
along with a few more for the pn544 and pn533 drivers, the LLCP
disconnection path and an LLCP memory leak.

Highlights for this one are:

- An initial secure element API. NFC chipsets can carry an embedded
  secure element or get access to the SIM one. In both cases they
  control the secure elements and this API provides a way to discover,
  enable and disable the available SEs. It also exports that to
  userspace in order for SE focused middleware to actually do something
  with them (e.g. payments).

- NCI over SPI support. SPI is the most complex NCI specified transport
  layer and we now have support for it in the kernel. The next step will
  be to implement drivers for NCI chipsets using this transport like
  e.g. bcm2079x.

- NFC p2p hardware simulation driver. We now have an nfcsim driver that
  is mostly a loopback device between 2 NFC interfaces. It also
  implements the rest of the NFC core API like polling and target
  detection. This driver, with neard running on top of it, allows us to
  completely test the LLCP, SNEP and Handover implementation without
  physical hardware.

- A Firmware update netlink API. Most (All ?) HCI chipsets have a
  special firmware update mode where applications can push a new
  firmware that will be flashed. We now have a netlink API for providing
  that mode to e.g. nfctool."

On top of all that, there are a variety of updates to brcmfmac,
iwlegacy, rtlwifi, wil6210, and the TI wl12xx drivers.  As usual,
the bcma and ssb busses get a little love as well, as do a handful
of others here and there.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 07cc61bf 7d2a47aa

Documentation/DocBook/80211.tmpl

+5 −6
Original line number Diff line number Diff line
@@ -127,12 +127,11 @@ 
!Finclude/net/cfg80211.h cfg80211_ibss_params

!Finclude/net/cfg80211.h cfg80211_connect_params

!Finclude/net/cfg80211.h cfg80211_pmksa

!Finclude/net/cfg80211.h cfg80211_send_rx_auth

!Finclude/net/cfg80211.h cfg80211_send_auth_timeout

!Finclude/net/cfg80211.h cfg80211_send_rx_assoc

!Finclude/net/cfg80211.h cfg80211_send_assoc_timeout

!Finclude/net/cfg80211.h cfg80211_send_deauth

!Finclude/net/cfg80211.h cfg80211_send_disassoc

!Finclude/net/cfg80211.h cfg80211_rx_mlme_mgmt

!Finclude/net/cfg80211.h cfg80211_auth_timeout

!Finclude/net/cfg80211.h cfg80211_rx_assoc_resp

!Finclude/net/cfg80211.h cfg80211_assoc_timeout

!Finclude/net/cfg80211.h cfg80211_tx_mlme_mgmt

!Finclude/net/cfg80211.h cfg80211_ibss_joined

!Finclude/net/cfg80211.h cfg80211_connect_result

!Finclude/net/cfg80211.h cfg80211_roamed

drivers/bcma/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config BCMA_HOST_PCI_POSSIBLE 
config BCMA_HOST_PCI

	bool "Support for BCMA on PCI-host bus"

	depends on BCMA_HOST_PCI_POSSIBLE

	default y



config BCMA_DRIVER_PCI_HOSTMODE

	bool "Driver for PCI core working in hostmode"

drivers/bcma/core.c

+25 −3
Original line number Diff line number Diff line
@@ -9,6 +9,25 @@ 
#include <linux/export.h>

#include <linux/bcma/bcma.h>



static bool bcma_core_wait_value(struct bcma_device *core, u16 reg, u32 mask,

				 u32 value, int timeout)

{

	unsigned long deadline = jiffies + timeout;

	u32 val;



	do {

		val = bcma_aread32(core, reg);

		if ((val & mask) == value)

			return true;

		cpu_relax();

		udelay(10);

	} while (!time_after_eq(jiffies, deadline));



	bcma_warn(core->bus, "Timeout waiting for register 0x%04X!\n", reg);



	return false;

}



bool bcma_core_is_enabled(struct bcma_device *core)

{

	if ((bcma_aread32(core, BCMA_IOCTL) & (BCMA_IOCTL_CLK | BCMA_IOCTL_FGC))
@@ -25,13 +44,15 @@ void bcma_core_disable(struct bcma_device *core, u32 flags) 
	if (bcma_aread32(core, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)

		return;



	bcma_awrite32(core, BCMA_IOCTL, flags);

	bcma_aread32(core, BCMA_IOCTL);

	udelay(10);

	bcma_core_wait_value(core, BCMA_RESET_ST, ~0, 0, 300);



	bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);

	bcma_aread32(core, BCMA_RESET_CTL);

	udelay(1);



	bcma_awrite32(core, BCMA_IOCTL, flags);

	bcma_aread32(core, BCMA_IOCTL);

	udelay(10);

}

EXPORT_SYMBOL_GPL(bcma_core_disable);
@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device *core, u32 flags) 
	bcma_aread32(core, BCMA_IOCTL);



	bcma_awrite32(core, BCMA_RESET_CTL, 0);

	bcma_aread32(core, BCMA_RESET_CTL);

	udelay(1);



	bcma_awrite32(core, BCMA_IOCTL, (BCMA_IOCTL_CLK | flags));

drivers/bcma/driver_chipcommon_sflash.c

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct bcma_sflash_tbl_e { 
	u16 numblocks;

};



static struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {

static const struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {

	{ "M25P20", 0x11, 0x10000, 4, },

	{ "M25P40", 0x12, 0x10000, 8, },
@@ -41,7 +41,7 @@ static struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = { 
	{ 0 },

};



static struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {

static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {

	{ "SST25WF512", 1, 0x1000, 16, },

	{ "SST25VF512", 0x48, 0x1000, 16, },

	{ "SST25WF010", 2, 0x1000, 32, },
@@ -59,7 +59,7 @@ static struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = { 
	{ 0 },

};



static struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {

static const struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {

	{ "AT45DB011", 0xc, 256, 512, },

	{ "AT45DB021", 0x14, 256, 1024, },

	{ "AT45DB041", 0x1c, 256, 2048, },
@@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc *cc) 
{

	struct bcma_bus *bus = cc->core->bus;

	struct bcma_sflash *sflash = &cc->sflash;

	struct bcma_sflash_tbl_e *e;

	const struct bcma_sflash_tbl_e *e;

	u32 id, id2;



	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {

drivers/bluetooth/btmrvl_sdio.c

+1 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv) 
	skb = bt_skb_alloc(num_blocks * blksz + BTSDIO_DMA_ALIGN, GFP_ATOMIC);

	if (skb == NULL) {

		BT_ERR("No free skb");

		ret = -ENOMEM;

		goto exit;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE