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

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

Merge tag 'wireless-drivers-for-davem-2016-01-29' of... 

Merge tag 'wireless-drivers-for-davem-2016-01-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
iwlwifi

* Fix support for 3168 device:
  * NVM version
  * firmware file name
  * device IDs
* Fix a compilation warning in dvm calibration code
* Fix the TPC (reduced Tx Power) code. This fixes performance issues
* Add device IDs for 8265

rtx2x00

* fix monitor mode regression dating back to 4.1

brcmfmac

* fix sdio initialisation related crash

rtlwifi

* rtl8821ae: Fix 5G failure when EEPROM is incorrectly encoded

ath9k

* ignore eeprom magic mismatch on flash based devices
====================

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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10036,7 +10036,7 @@ F: drivers/net/ethernet/natsemi/sonic.* 


SONICS SILICON BACKPLANE DRIVER (SSB)

M:	Michael Buesch <m@bues.ch>

L:	netdev@vger.kernel.org

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/ssb/

F:	include/linux/ssb/

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

+6 −6
Original line number Diff line number Diff line
@@ -150,18 +150,18 @@ int ath9k_hw_nvram_swap_data(struct ath_hw *ah, bool *swap_needed, int size) 
		return -EIO;

	}



	if (magic == AR5416_EEPROM_MAGIC) {

	*swap_needed = false;

	} else if (swab16(magic) == AR5416_EEPROM_MAGIC) {

	if (swab16(magic) == AR5416_EEPROM_MAGIC) {

		if (ah->ah_flags & AH_NO_EEP_SWAP) {

			ath_info(common,

				 "Ignoring endianness difference in EEPROM magic bytes.\n");



			*swap_needed = false;

		} else {

			*swap_needed = true;

		}

	} else {

	} else if (magic != AR5416_EEPROM_MAGIC) {

		if (ath9k_hw_use_flash(ah))

			return 0;



		ath_err(common,

			"Invalid EEPROM Magic (0x%04x).\n", magic);

		return -EINVAL;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c

+15 −25
Original line number Diff line number Diff line
@@ -879,11 +879,24 @@ int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, uint fn) 
	return 0;

}



static void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)

void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)

{

	struct sdio_func *func;

	struct mmc_host *host;

	uint max_blocks;

	uint nents;

	int err;



	func = sdiodev->func[2];

	host = func->card->host;

	sdiodev->sg_support = host->max_segs > 1;

	max_blocks = min_t(uint, host->max_blk_count, 511u);

	sdiodev->max_request_size = min_t(uint, host->max_req_size,

					  max_blocks * func->cur_blksize);

	sdiodev->max_segment_count = min_t(uint, host->max_segs,

					   SG_MAX_SINGLE_ALLOC);

	sdiodev->max_segment_size = host->max_seg_size;



	if (!sdiodev->sg_support)

		return;
@@ -1021,9 +1034,6 @@ static void brcmf_sdiod_host_fixup(struct mmc_host *host) 


static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)

{

	struct sdio_func *func;

	struct mmc_host *host;

	uint max_blocks;

	int ret = 0;



	sdiodev->num_funcs = 2;
@@ -1054,26 +1064,6 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev) 
		goto out;

	}



	/*

	 * determine host related variables after brcmf_sdiod_probe()

	 * as func->cur_blksize is properly set and F2 init has been

	 * completed successfully.

	 */

	func = sdiodev->func[2];

	host = func->card->host;

	sdiodev->sg_support = host->max_segs > 1;

	max_blocks = min_t(uint, host->max_blk_count, 511u);

	sdiodev->max_request_size = min_t(uint, host->max_req_size,

					  max_blocks * func->cur_blksize);

	sdiodev->max_segment_count = min_t(uint, host->max_segs,

					   SG_MAX_SINGLE_ALLOC);

	sdiodev->max_segment_size = host->max_seg_size;



	/* allocate scatter-gather table. sg support

	 * will be disabled upon allocation failure.

	 */

	brcmf_sdiod_sgtable_alloc(sdiodev);



	ret = brcmf_sdiod_freezer_attach(sdiodev);

	if (ret)

		goto out;
@@ -1084,7 +1074,7 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev) 
		ret = -ENODEV;

		goto out;

	}

	brcmf_sdiod_host_fixup(host);

	brcmf_sdiod_host_fixup(sdiodev->func[2]->card->host);

out:

	if (ret)

		brcmf_sdiod_remove(sdiodev);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/netdevice.h>

#include <linux/module.h>

#include <brcmu_wifi.h>

#include <brcmu_utils.h>

#include "core.h"

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+5 −0
Original line number Diff line number Diff line
@@ -4114,6 +4114,11 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) 
		goto fail;

	}



	/* allocate scatter-gather table. sg support

	 * will be disabled upon allocation failure.

	 */

	brcmf_sdiod_sgtable_alloc(bus->sdiodev);



	/* Query the F2 block size, set roundup accordingly */

	bus->blocksize = bus->sdiodev->func[2]->cur_blksize;

	bus->roundup = min(max_roundup, bus->blocksize);