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

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

Merge tag 'master-2014-09-23' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-09-23

Please consider pulling this one last batch of fixes intended for the 3.17 stream!

For the NFC bits, Samuel says:

"Hopefully not too late for a handful of NFC fixes:

- 2 potential build failures for ST21NFCA and ST21NFCB, triggered by a
  depmod dependenyc cycle.
- One potential buffer overflow in the microread driver."

On top of that...

Emil Goode provides a fix for a brcmfmac off-by-one regression which
was introduced in the 3.17 cycle.

Loic Poulain fixes a polarity mismatch for a variable assignment
inside of rfkill-gpio.

Wojciech Dubowik prevents a NULL pointer dereference in ath9k.
====================

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

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

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ irqreturn_t ath_isr(int irq, void *dev) 
	 * touch anything. Note this can happen early

	 * on if the IRQ is shared.

	 */

	if (test_bit(ATH_OP_INVALID, &common->op_flags))

	if (!ah || test_bit(ATH_OP_INVALID, &common->op_flags))

		return IRQ_NONE;



	/* shared irq, not for us */

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -4921,7 +4921,7 @@ static void brcmf_count_20mhz_channels(struct brcmf_cfg80211_info *cfg, 
	struct brcmu_chan ch;

	int i;



	for (i = 0; i <= total; i++) {

	for (i = 0; i < total; i++) {

		ch.chspec = (u16)le32_to_cpu(chlist->element[i]);

		cfg->d11inf.decchspec(&ch);

drivers/nfc/microread/microread.c

+12 −4
Original line number Diff line number Diff line
@@ -501,9 +501,13 @@ static void microread_target_discovered(struct nfc_hci_dev *hdev, u8 gate, 
		targets->sens_res =

			 be16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_A_ATQA]);

		targets->sel_res = skb->data[MICROREAD_EMCF_A_SAK];

		memcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_A_UID],

		       skb->data[MICROREAD_EMCF_A_LEN]);

		targets->nfcid1_len = skb->data[MICROREAD_EMCF_A_LEN];

		if (targets->nfcid1_len > sizeof(targets->nfcid1)) {

			r = -EINVAL;

			goto exit_free;

		}

		memcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_A_UID],

		       targets->nfcid1_len);

		break;

	case MICROREAD_GATE_ID_MREAD_ISO_A_3:

		targets->supported_protocols =
@@ -511,9 +515,13 @@ static void microread_target_discovered(struct nfc_hci_dev *hdev, u8 gate, 
		targets->sens_res =

			 be16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_A3_ATQA]);

		targets->sel_res = skb->data[MICROREAD_EMCF_A3_SAK];

		memcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_A3_UID],

		       skb->data[MICROREAD_EMCF_A3_LEN]);

		targets->nfcid1_len = skb->data[MICROREAD_EMCF_A3_LEN];

		if (targets->nfcid1_len > sizeof(targets->nfcid1)) {

			r = -EINVAL;

			goto exit_free;

		}

		memcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_A3_UID],

		       targets->nfcid1_len);

		break;

	case MICROREAD_GATE_ID_MREAD_ISO_B:

		targets->supported_protocols = NFC_PROTO_ISO14443_B_MASK;

drivers/nfc/st21nfca/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
# Makefile for ST21NFCA HCI based NFC driver

#



st21nfca_i2c-objs  = i2c.o

st21nfca_hci-objs = st21nfca.o st21nfca_dep.o

obj-$(CONFIG_NFC_ST21NFCA)     += st21nfca_hci.o



obj-$(CONFIG_NFC_ST21NFCA)     += st21nfca.o st21nfca_dep.o

st21nfca_i2c-objs  = i2c.o

obj-$(CONFIG_NFC_ST21NFCA_I2C) += st21nfca_i2c.o

drivers/nfc/st21nfcb/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
# Makefile for ST21NFCB NCI based NFC driver

#



st21nfcb_i2c-objs  = i2c.o

st21nfcb_nci-objs = ndlc.o st21nfcb.o

obj-$(CONFIG_NFC_ST21NFCB)     += st21nfcb_nci.o



obj-$(CONFIG_NFC_ST21NFCB)     += st21nfcb.o ndlc.o

st21nfcb_i2c-objs = i2c.o

obj-$(CONFIG_NFC_ST21NFCB_I2C) += st21nfcb_i2c.o