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

Commit 96da266e authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents 9109e17f a31267c3

drivers/bcma/driver_gpio.c

+8 −1
Original line number Diff line number Diff line
@@ -218,7 +218,14 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)

	chip->to_irq		= bcma_gpio_to_irq;

#endif

	switch (cc->core->bus->chipinfo.id) {

	case BCMA_CHIP_ID_BCM5357:

		chip->ngpio	= 32;

		break;

	default:

		chip->ngpio	= 16;

	}



	/* There is just one SoC in one device and its GPIO addresses should be

	 * deterministic to address them more easily. The other buses could get

	 * a random base number. */

drivers/bluetooth/bluecard_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static void bluecard_release(struct pcmcia_device *link) 


	bluecard_close(info);



	del_timer(&(info->timer));

	del_timer_sync(&(info->timer));



	pcmcia_disable_device(link);

}

drivers/bluetooth/btmrvl_main.c

+6 −5
Original line number Diff line number Diff line
@@ -59,14 +59,15 @@ bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb) 
			priv->btmrvl_dev.sendcmdflag = false;

			priv->adapter->cmd_complete = true;

			wake_up_interruptible(&priv->adapter->cmd_wait_q);

		}



			if (hci_opcode_ogf(opcode) == 0x3F) {

			BT_DBG("vendor event skipped: opcode=%#4.4x", opcode);

				BT_DBG("vendor event skipped: opcode=%#4.4x",

				       opcode);

				kfree_skb(skb);

				return false;

			}

		}

	}



	return true;

}

drivers/net/wireless/ath/carl9170/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len) 


static void carl9170_ba_check(struct ar9170 *ar, void *data, unsigned int len)

{

	struct ieee80211_bar *bar = (void *) data;

	struct ieee80211_bar *bar = data;

	struct carl9170_bar_list_entry *entry;

	unsigned int queue;

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

+10 −5
Original line number Diff line number Diff line
@@ -1354,13 +1354,14 @@ static s32 brcmf_set_auth_type(struct net_device *ndev, 
}



static s32

brcmf_set_set_cipher(struct net_device *ndev,

		     struct cfg80211_connect_params *sme)

brcmf_set_wsec_mode(struct net_device *ndev,

		     struct cfg80211_connect_params *sme, bool mfp)

{

	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);

	struct brcmf_cfg80211_security *sec;

	s32 pval = 0;

	s32 gval = 0;

	s32 wsec;

	s32 err = 0;



	if (sme->crypto.n_ciphers_pairwise) {
@@ -1412,7 +1413,12 @@ brcmf_set_set_cipher(struct net_device *ndev, 
	if (brcmf_find_wpsie(sme->ie, sme->ie_len) && !pval && !gval &&

	    sme->privacy)

		pval = AES_ENABLED;

	err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wsec", pval | gval);



	if (mfp)

		wsec = pval | gval | MFP_CAPABLE;

	else

		wsec = pval | gval;

	err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wsec", wsec);

	if (err) {

		brcmf_err("error (%d)\n", err);

		return err;
@@ -1582,7 +1588,6 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev, 
	u32 ie_len;

	struct brcmf_ext_join_params_le *ext_join_params;

	u16 chanspec;



	s32 err = 0;



	brcmf_dbg(TRACE, "Enter\n");
@@ -1651,7 +1656,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev, 
		goto done;

	}



	err = brcmf_set_set_cipher(ndev, sme);

	err = brcmf_set_wsec_mode(ndev, sme, sme->mfp == NL80211_MFP_REQUIRED);

	if (err) {

		brcmf_err("wl_set_set_cipher failed (%d)\n", err);

		goto done;