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

Commit 6a4cd3fd 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 



John W. Linville says:

====================
A few stragglers hoping for 3.9, somewhat delayed due to my travels...

On the mac80211 bits, Johannes says:

"Sadly, I have another pull request -- the idle handling fix broke LED
handling in some cases."

and:

"Yet one more!

This fixes a fairly important/annoying bug -- when roaming between
multiple APs of the same network, the system could get stuck thinking it
was connected to the old one while it really wasn't."

On top of that...

Arend sends a brcmfmac patch that removes advertising a feature that
isn't actually fully supported, and a brcmsmac patch that rearranges
code to request firmware at IFF_UP to play more nicely with being
built into the kernel.

Felix gives us a minor ath9k_htc fix to support the newly released
open source firmware, and an ath9k_hw initvals fix to improve device
stability.

Rafał Miłecki provides a fix for an ssb regression that caused a
serious performance problem with b43.

Zefir Kurtisi offers an ath9k fix to change some kmalloc flags to
allow the DFS detector to be called in softirq context.

Please let me know if there are problems.  If these don't make 3.9,
I'll just pull them into wireless-next -- just let me know if you
want to do it that way!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 12fb3dd9 5a22483e

drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ static const u32 ar9580_1p0_mac_core[][2] = { 
	{0x00008258, 0x00000000},

	{0x0000825c, 0x40000000},

	{0x00008260, 0x00080922},

	{0x00008264, 0x9bc00010},

	{0x00008264, 0x9d400010},

	{0x00008268, 0xffffffff},

	{0x0000826c, 0x0000ffff},

	{0x00008270, 0x00000000},

drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c

+2 −2
Original line number Diff line number Diff line
@@ -143,14 +143,14 @@ channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq) 
	u32 sz, i;

	struct channel_detector *cd;



	cd = kmalloc(sizeof(*cd), GFP_KERNEL);

	cd = kmalloc(sizeof(*cd), GFP_ATOMIC);

	if (cd == NULL)

		goto fail;



	INIT_LIST_HEAD(&cd->head);

	cd->freq = freq;

	sz = sizeof(cd->detectors) * dpd->num_radar_types;

	cd->detectors = kzalloc(sz, GFP_KERNEL);

	cd->detectors = kzalloc(sz, GFP_ATOMIC);

	if (cd->detectors == NULL)

		goto fail;

drivers/net/wireless/ath/ath9k/dfs_pri_detector.c

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static bool pulse_queue_enqueue(struct pri_detector *pde, u64 ts) 
{

	struct pulse_elem *p = pool_get_pulse_elem();

	if (p == NULL) {

		p = kmalloc(sizeof(*p), GFP_KERNEL);

		p = kmalloc(sizeof(*p), GFP_ATOMIC);

		if (p == NULL) {

			DFS_POOL_STAT_INC(pulse_alloc_error);

			return false;
@@ -299,7 +299,7 @@ static bool pseq_handler_create_sequences(struct pri_detector *pde, 
		ps.deadline_ts = ps.first_ts + ps.dur;

		new_ps = pool_get_pseq_elem();

		if (new_ps == NULL) {

			new_ps = kmalloc(sizeof(*new_ps), GFP_KERNEL);

			new_ps = kmalloc(sizeof(*new_ps), GFP_ATOMIC);

			if (new_ps == NULL) {

				DFS_POOL_STAT_INC(pseq_alloc_error);

				return false;

drivers/net/wireless/ath/ath9k/htc_drv_init.c

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static int ath9k_init_firmware_version(struct ath9k_htc_priv *priv) 
	 * required version.

	 */

	if (priv->fw_version_major != MAJOR_VERSION_REQ ||

	    priv->fw_version_minor != MINOR_VERSION_REQ) {

	    priv->fw_version_minor < MINOR_VERSION_REQ) {

		dev_err(priv->dev, "ath9k_htc: Please upgrade to FW version %d.%d\n",

			MAJOR_VERSION_REQ, MINOR_VERSION_REQ);

		return -EINVAL;

drivers/net/wireless/b43/phy_n.c

+2 −1
Original line number Diff line number Diff line
@@ -5165,7 +5165,8 @@ static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid) 
#endif

#ifdef CONFIG_B43_SSB

	case B43_BUS_SSB:

		/* FIXME */

		ssb_pmu_spuravoid_pllupdate(&dev->dev->sdev->bus->chipco,

					    avoid);

		break;

#endif

	}