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

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

Merge tag 'master-2014-07-25' of... 

Merge tag 'master-2014-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next



John W. Linville says:

====================
pull request: wireless-next 2014-07-25

Please pull this batch of updates intended for the 3.17 stream!

For the mac80211 bits, Johannes says:

"We have a lot of TDLS patches, among them a fix that should make hwsim
tests happy again. The rest, this time, is mostly small fixes."

For the Bluetooth bits, Gustavo says:

"Some more patches for 3.17. The most important change here is the move of
the 6lowpan code to net/6lowpan. It has been agreed with Davem that this
change will go through the bluetooth tree. The rest are mostly clean up and
fixes."

and,

"Here follows some more patches for 3.17. These are mostly fixes to what
we've sent to you before for next merge window."

For the iwlwifi bits, Emmanuel says:

"I have the usual amount of BT Coex stuff. Arik continues to work
on TDLS and Ariej contributes a few things for HS2.0. I added a few
more things to the firmware debugging infrastructure. Eran fixes a
small bug - pretty normal content."

And for the Atheros bits, Kalle says:

"For ath6kl me and Jessica added support for ar6004 hw3.0, our latest
version of ar6004.

For ath10k Janusz added a printout so that it's easier to check what
ath10k kconfig options are enabled. He also added a debugfs file to
configure maximum amsdu and ampdu values. Also we had few fixes as
usual."

On top of that is the usual large batch of various driver updates --
brcmfmac, mwifiex, the TI drivers, and wil6210 all get some action.
Rafał has also been very busy with b43 and related updates.

Also, I pulled the wireless tree into this in order to resolve a
merge conflict...

P.S.  The change to fs/compat_ioctl.c reflects a name change in a
Bluetooth header file...
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a67eed57 9a244409

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -148,6 +148,13 @@ L: linux-scsi@vger.kernel.org 
S:	Maintained

F:	drivers/scsi/53c700*



6LOWPAN GENERIC (BTLE/IEEE 802.15.4)

M:	Alexander Aring <alex.aring@gmail.com>

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

L:	linux-bluetooth@vger.kernel.org

S:	Maintained

F:	net/6lowpan/



6PACK NETWORK DRIVER FOR AX.25

M:	Andreas Koensgen <ajk@comnets.uni-bremen.de>

L:	linux-hams@vger.kernel.org

drivers/bcma/driver_chipcommon_pmu.c

+1 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid) 
		tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW;

		break;



	case BCMA_CHIP_ID_BCM43217:

	case BCMA_CHIP_ID_BCM43227:

	case BCMA_CHIP_ID_BCM43228:

	case BCMA_CHIP_ID_BCM43428:

drivers/bcma/host_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

	{ 0, },

};

drivers/bcma/sprom.c

+34 −8
Original line number Diff line number Diff line
@@ -201,6 +201,23 @@ static int bcma_sprom_valid(struct bcma_bus *bus, const u16 *sprom, 
		SPEX(_field[7], _offset + 14, _mask, _shift);	\

	} while (0)



static s8 sprom_extract_antgain(const u16 *in, u16 offset, u16 mask, u16 shift)

{

	u16 v;

	u8 gain;



	v = in[SPOFF(offset)];

	gain = (v & mask) >> shift;

	if (gain == 0xFF) {

		gain = 8; /* If unset use 2dBm */

	} else {

		/* Q5.2 Fractional part is stored in 0xC0 */

		gain = ((gain & 0xC0) >> 6) | ((gain & 0x3F) << 2);

	}



	return (s8)gain;

}



static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)

{

	u16 v, o;
@@ -381,14 +398,22 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom) 
	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, ~0, 0);



	/* Extract the antenna gain values. */

	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,

	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);

	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,

	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);

	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,

	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);

	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,

	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);

	bus->sprom.antenna_gain.a0 = sprom_extract_antgain(sprom,

							   SSB_SPROM8_AGAIN01,

							   SSB_SPROM8_AGAIN0,

							   SSB_SPROM8_AGAIN0_SHIFT);

	bus->sprom.antenna_gain.a1 = sprom_extract_antgain(sprom,

							   SSB_SPROM8_AGAIN01,

							   SSB_SPROM8_AGAIN1,

							   SSB_SPROM8_AGAIN1_SHIFT);

	bus->sprom.antenna_gain.a2 = sprom_extract_antgain(sprom,

							   SSB_SPROM8_AGAIN23,

							   SSB_SPROM8_AGAIN2,

							   SSB_SPROM8_AGAIN2_SHIFT);

	bus->sprom.antenna_gain.a3 = sprom_extract_antgain(sprom,

							   SSB_SPROM8_AGAIN23,

							   SSB_SPROM8_AGAIN3,

							   SSB_SPROM8_AGAIN3_SHIFT);



	SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON,

	     SSB_SPROM8_LEDDC_ON_SHIFT);
@@ -509,6 +534,7 @@ static bool bcma_sprom_onchip_available(struct bcma_bus *bus) 
		/* for these chips OTP is always available */

		present = true;

		break;

	case BCMA_CHIP_ID_BCM43217:

	case BCMA_CHIP_ID_BCM43227:

	case BCMA_CHIP_ID_BCM43228:

	case BCMA_CHIP_ID_BCM43428:

drivers/bluetooth/ath3k.c

+16 −13
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/device.h>

#include <linux/firmware.h>

#include <linux/usb.h>

#include <asm/unaligned.h>

#include <net/bluetooth/bluetooth.h>



#define VERSION "1.0"
@@ -50,12 +51,12 @@ 
#define ATH3K_NAME_LEN				0xFF



struct ath3k_version {

	unsigned int	rom_version;

	unsigned int	build_version;

	unsigned int	ram_version;

	unsigned char	ref_clock;

	unsigned char	reserved[0x07];

};

	__le32	rom_version;

	__le32	build_version;

	__le32	ram_version;

	__u8	ref_clock;

	__u8	reserved[7];

} __packed;



static const struct usb_device_id ath3k_table[] = {

	/* Atheros AR3011 */
@@ -349,7 +350,8 @@ static int ath3k_load_patch(struct usb_device *udev) 
	unsigned char fw_state;

	char filename[ATH3K_NAME_LEN] = {0};

	const struct firmware *firmware;

	struct ath3k_version fw_version, pt_version;

	struct ath3k_version fw_version;

	__u32 pt_rom_version, pt_build_version;

	int ret;



	ret = ath3k_get_state(udev, &fw_state);
@@ -378,12 +380,13 @@ static int ath3k_load_patch(struct usb_device *udev) 
		return ret;

	}



	pt_version.rom_version = *(int *)(firmware->data + firmware->size - 8);

	pt_version.build_version = *(int *)

		(firmware->data + firmware->size - 4);

	pt_rom_version = get_unaligned_le32(firmware->data +

					    firmware->size - 8);

	pt_build_version = get_unaligned_le32(firmware->data +

					      firmware->size - 4);



	if ((pt_version.rom_version != fw_version.rom_version) ||

		(pt_version.build_version <= fw_version.build_version)) {

	if (pt_rom_version != le32_to_cpu(fw_version.rom_version) ||

	    pt_build_version <= le32_to_cpu(fw_version.build_version)) {

		BT_ERR("Patch file version did not match with firmware");

		release_firmware(firmware);

		return -EINVAL;