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

Commit 7d2a47aa 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:
	net/wireless/nl80211.c
parents fedaf4ff b887664d

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;

	}