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

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

Merge branch 'wireless' 



John W. Linville says:

====================
Please accept this pull request for the 3.10 stream...

Regarding the mac80211 bits, Johannes says:

"Here I have a bunch of minstrel fixes from Felix, per-interface
multicast filtering from Alex, set_tim debouncing from Ilan,
per-interface debugfs cleanups from Stanislaw, an error return fix from
Wei and a number of small improvements and fixes that I made myself."

And for the iwlwifi bits, Johannes says:

"Andrei changed an instance of kmalloc+memdup to kmemdup, Stanislaw
removed the now unused 5ghz_disable module parameter. I also have a
number of fixes from Ilan, Emmanuel and myself, Emmanuel also continued
working on Bluetooth coexistence."

For the sizeable batch of Bluetooth bits, Gustavo says:

"This is our first batch of patches for 3.10. The biggest changes of this pull
request are from Johan Hedberg, he implemented a HCI request framework to make
life easier when we have to send many HCI commands and a block and wait for
all of the to finish, we were able to fix a few issues in stack with the
introduction of this framework.

Other than that Dean Jenkins did a good work cleaning the RFCOMM code, the
refcnt infrastructure was removed and now we use NULL pointer checks to know
when a object was freed or not. That code was buggy and now it looks a way
better.

The rest of changes are clean ups, fixes and small improvements all over the
Bluetooth subsystem."

Regarding the wl12xx bits, Luca says:

"Some patches intended for 3.10.  Mostly bug fixes and other small
improvements."

On top of that, there are updates to brcmfmac, brcmsmac, b43, ssb and
bcma, as well as mwifiex, rt2x00, and ath9k and a few others.  The most
notable bit is the addition of a new driver in the rtlwifi family.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 953c96e0 d3641409

Documentation/DocBook/80211.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -437,7 +437,7 @@ 
      </section>

      </section>

!Finclude/net/mac80211.h ieee80211_get_buffered_bc

!Finclude/net/mac80211.h ieee80211_get_buffered_bc

!Finclude/net/mac80211.h ieee80211_beacon_get

!Finclude/net/mac80211.h ieee80211_beacon_get

!Finclude/net/mac80211.h ieee80211_sta_eosp_irqsafe

!Finclude/net/mac80211.h ieee80211_sta_eosp

!Finclude/net/mac80211.h ieee80211_frame_release_type

!Finclude/net/mac80211.h ieee80211_frame_release_type

!Finclude/net/mac80211.h ieee80211_sta_ps_transition

!Finclude/net/mac80211.h ieee80211_sta_ps_transition

!Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni

!Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni

drivers/bcma/driver_chipcommon.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -25,13 +25,14 @@ static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset, 
	return value;

	return value;

}

}





static u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc)

u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc)

{

{

	if (cc->capabilities & BCMA_CC_CAP_PMU)

	if (cc->capabilities & BCMA_CC_CAP_PMU)

		return bcma_pmu_get_alp_clock(cc);

		return bcma_pmu_get_alp_clock(cc);





	return 20000000;

	return 20000000;

}

}

EXPORT_SYMBOL_GPL(bcma_chipco_get_alp_clock);





static u32 bcma_chipco_watchdog_get_max_timer(struct bcma_drv_cc *cc)

static u32 bcma_chipco_watchdog_get_max_timer(struct bcma_drv_cc *cc)

{

{
@@ -213,6 +214,7 @@ u32 bcma_chipco_gpio_out(struct bcma_drv_cc *cc, u32 mask, u32 value) 




	return res;

	return res;

}

}

EXPORT_SYMBOL_GPL(bcma_chipco_gpio_out);





u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value)

u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value)

{

{
@@ -225,6 +227,7 @@ u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value) 




	return res;

	return res;

}

}

EXPORT_SYMBOL_GPL(bcma_chipco_gpio_outen);





/*

/*

 * If the bit is set to 0, chipcommon controlls this GPIO,

 * If the bit is set to 0, chipcommon controlls this GPIO,

drivers/bcma/driver_chipcommon_pmu.c

+25 −9
Original line number Original line Diff line number Diff line
@@ -174,19 +174,35 @@ u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc) 
	struct bcma_bus *bus = cc->core->bus;

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





	switch (bus->chipinfo.id) {

	switch (bus->chipinfo.id) {

	case BCMA_CHIP_ID_BCM4313:

	case BCMA_CHIP_ID_BCM43224:

	case BCMA_CHIP_ID_BCM43225:

	case BCMA_CHIP_ID_BCM43227:

	case BCMA_CHIP_ID_BCM43228:

	case BCMA_CHIP_ID_BCM4331:

	case BCMA_CHIP_ID_BCM43421:

	case BCMA_CHIP_ID_BCM43428:

	case BCMA_CHIP_ID_BCM43431:

	case BCMA_CHIP_ID_BCM4716:

	case BCMA_CHIP_ID_BCM4716:

	case BCMA_CHIP_ID_BCM4748:

	case BCMA_CHIP_ID_BCM47162:

	case BCMA_CHIP_ID_BCM47162:

	case BCMA_CHIP_ID_BCM4313:

	case BCMA_CHIP_ID_BCM4748:

	case BCMA_CHIP_ID_BCM5357:

	case BCMA_CHIP_ID_BCM4749:

	case BCMA_CHIP_ID_BCM4749:

	case BCMA_CHIP_ID_BCM5357:

	case BCMA_CHIP_ID_BCM53572:

	case BCMA_CHIP_ID_BCM53572:

	case BCMA_CHIP_ID_BCM6362:

		/* always 20Mhz */

		/* always 20Mhz */

		return 20000 * 1000;

		return 20000 * 1000;

	case BCMA_CHIP_ID_BCM5356:

	case BCMA_CHIP_ID_BCM4706:

	case BCMA_CHIP_ID_BCM4706:

	case BCMA_CHIP_ID_BCM5356:

		/* always 25Mhz */

		/* always 25Mhz */

		return 25000 * 1000;

		return 25000 * 1000;

	case BCMA_CHIP_ID_BCM43460:

	case BCMA_CHIP_ID_BCM4352:

	case BCMA_CHIP_ID_BCM4360:

		if (cc->status & BCMA_CC_CHIPST_4360_XTAL_40MZ)

			return 40000 * 1000;

		else

			return 20000 * 1000;

	default:

	default:

		bcma_warn(bus, "No ALP clock specified for %04X device, pmu rev. %d, using default %d Hz\n",

		bcma_warn(bus, "No ALP clock specified for %04X device, pmu rev. %d, using default %d Hz\n",

			  bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);

			  bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);
@@ -373,7 +389,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid) 
		tmp |= (bcm5357_bcm43236_ndiv[spuravoid]) << BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_SHIFT;

		tmp |= (bcm5357_bcm43236_ndiv[spuravoid]) << BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_SHIFT;

		bcma_cc_write32(cc, BCMA_CC_PLLCTL_DATA, tmp);

		bcma_cc_write32(cc, BCMA_CC_PLLCTL_DATA, tmp);





		tmp = 1 << 10;

		tmp = BCMA_CC_PMU_CTL_PLL_UPD;

		break;

		break;





	case BCMA_CHIP_ID_BCM4331:

	case BCMA_CHIP_ID_BCM4331:
@@ -394,7 +410,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid) 
			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,

			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,

						     0x03000a08);

						     0x03000a08);

		}

		}

		tmp = 1 << 10;

		tmp = BCMA_CC_PMU_CTL_PLL_UPD;

		break;

		break;





	case BCMA_CHIP_ID_BCM43224:

	case BCMA_CHIP_ID_BCM43224:
@@ -427,7 +443,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid) 
			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,

			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,

						     0x88888815);

						     0x88888815);

		}

		}

		tmp = 1 << 10;

		tmp = BCMA_CC_PMU_CTL_PLL_UPD;

		break;

		break;





	case BCMA_CHIP_ID_BCM4716:

	case BCMA_CHIP_ID_BCM4716:
@@ -461,7 +477,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid) 
						     0x88888815);

						     0x88888815);

		}

		}





		tmp = 3 << 9;

		tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW;

		break;

		break;





	case BCMA_CHIP_ID_BCM43227:

	case BCMA_CHIP_ID_BCM43227:
@@ -497,7 +513,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid) 
			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,

			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,

						     0x88888815);

						     0x88888815);

		}

		}

		tmp = 1 << 10;

		tmp = BCMA_CC_PMU_CTL_PLL_UPD;

		break;

		break;

	default:

	default:

		bcma_err(bus, "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",

		bcma_err(bus, "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",

drivers/bcma/scan.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -137,19 +137,19 @@ static void bcma_scan_switch_core(struct bcma_bus *bus, u32 addr) 
				       addr);

				       addr);

}

}





static u32 bcma_erom_get_ent(struct bcma_bus *bus, u32 **eromptr)

static u32 bcma_erom_get_ent(struct bcma_bus *bus, u32 __iomem **eromptr)

{

{

	u32 ent = readl(*eromptr);

	u32 ent = readl(*eromptr);

	(*eromptr)++;

	(*eromptr)++;

	return ent;

	return ent;

}

}





static void bcma_erom_push_ent(u32 **eromptr)

static void bcma_erom_push_ent(u32 __iomem **eromptr)

{

{

	(*eromptr)--;

	(*eromptr)--;

}

}





static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 **eromptr)

static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 __iomem **eromptr)

{

{

	u32 ent = bcma_erom_get_ent(bus, eromptr);

	u32 ent = bcma_erom_get_ent(bus, eromptr);

	if (!(ent & SCAN_ER_VALID))

	if (!(ent & SCAN_ER_VALID))
@@ -159,14 +159,14 @@ static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 **eromptr) 
	return ent;

	return ent;

}

}





static bool bcma_erom_is_end(struct bcma_bus *bus, u32 **eromptr)

static bool bcma_erom_is_end(struct bcma_bus *bus, u32 __iomem **eromptr)

{

{

	u32 ent = bcma_erom_get_ent(bus, eromptr);

	u32 ent = bcma_erom_get_ent(bus, eromptr);

	bcma_erom_push_ent(eromptr);

	bcma_erom_push_ent(eromptr);

	return (ent == (SCAN_ER_TAG_END | SCAN_ER_VALID));

	return (ent == (SCAN_ER_TAG_END | SCAN_ER_VALID));

}

}





static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 **eromptr)

static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 __iomem **eromptr)

{

{

	u32 ent = bcma_erom_get_ent(bus, eromptr);

	u32 ent = bcma_erom_get_ent(bus, eromptr);

	bcma_erom_push_ent(eromptr);

	bcma_erom_push_ent(eromptr);
@@ -175,7 +175,7 @@ static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 **eromptr) 
		((ent & SCAN_ADDR_TYPE) == SCAN_ADDR_TYPE_BRIDGE));

		((ent & SCAN_ADDR_TYPE) == SCAN_ADDR_TYPE_BRIDGE));

}

}





static void bcma_erom_skip_component(struct bcma_bus *bus, u32 **eromptr)

static void bcma_erom_skip_component(struct bcma_bus *bus, u32 __iomem **eromptr)

{

{

	u32 ent;

	u32 ent;

	while (1) {

	while (1) {
@@ -189,7 +189,7 @@ static void bcma_erom_skip_component(struct bcma_bus *bus, u32 **eromptr) 
	bcma_erom_push_ent(eromptr);

	bcma_erom_push_ent(eromptr);

}

}





static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 **eromptr)

static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 __iomem **eromptr)

{

{

	u32 ent = bcma_erom_get_ent(bus, eromptr);

	u32 ent = bcma_erom_get_ent(bus, eromptr);

	if (!(ent & SCAN_ER_VALID))

	if (!(ent & SCAN_ER_VALID))
@@ -199,7 +199,7 @@ static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 **eromptr) 
	return ent;

	return ent;

}

}





static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 **eromptr,

static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,

				  u32 type, u8 port)

				  u32 type, u8 port)

{

{

	u32 addrl, addrh, sizel, sizeh = 0;

	u32 addrl, addrh, sizel, sizeh = 0;

drivers/bcma/sprom.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -217,6 +217,7 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom) 
	}

	}





	SPEX(board_rev, SSB_SPROM8_BOARDREV, ~0, 0);

	SPEX(board_rev, SSB_SPROM8_BOARDREV, ~0, 0);

	SPEX(board_type, SSB_SPROM1_SPID, ~0, 0);





	SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G0,

	SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G0,

	     SSB_SPROM4_TXPID2G0_SHIFT);

	     SSB_SPROM4_TXPID2G0_SHIFT);