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

Commit 39c253ed 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 into for-davem
parents e9e4ea74 9612bd1e

drivers/net/wireless/cw1200/cw1200_spi.c

+2 −0
Original line number Diff line number Diff line
@@ -237,7 +237,9 @@ static irqreturn_t cw1200_spi_irq_handler(int irq, void *dev_id) 
	struct hwbus_priv *self = dev_id;



	if (self->core) {

		cw1200_spi_lock(self);

		cw1200_irq_handler(self->core);

		cw1200_spi_unlock(self);

		return IRQ_HANDLED;

	} else {

		return IRQ_NONE;

drivers/net/wireless/mwifiex/join.c

+8 −2
Original line number Diff line number Diff line
@@ -1422,13 +1422,19 @@ static int mwifiex_deauthenticate_infra(struct mwifiex_private *priv, u8 *mac) 
 */

int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac)

{

	int ret = 0;



	if (!priv->media_connected)

		return 0;



	switch (priv->bss_mode) {

	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_P2P_CLIENT:

		return mwifiex_deauthenticate_infra(priv, mac);

		ret = mwifiex_deauthenticate_infra(priv, mac);

		if (ret)

			cfg80211_disconnected(priv->netdev, 0, NULL, 0,

					      GFP_KERNEL);

		break;

	case NL80211_IFTYPE_ADHOC:

		return mwifiex_send_cmd_sync(priv,

					     HostCmd_CMD_802_11_AD_HOC_STOP,
@@ -1440,7 +1446,7 @@ int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac) 
		break;

	}



	return 0;

	return ret;

}

EXPORT_SYMBOL_GPL(mwifiex_deauthenticate);

drivers/net/wireless/mwifiex/sta_event.c

+2 −1
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code) 
	dev_dbg(adapter->dev,

		"info: successfully disconnected from %pM: reason code %d\n",

		priv->cfg_bssid, reason_code);

	if (priv->bss_mode == NL80211_IFTYPE_STATION) {

	if (priv->bss_mode == NL80211_IFTYPE_STATION ||

	    priv->bss_mode == NL80211_IFTYPE_P2P_CLIENT) {

		cfg80211_disconnected(priv->netdev, reason_code, NULL, 0,

				      GFP_KERNEL);

	}

drivers/net/wireless/rtlwifi/rtl8192cu/trx.c

+2 −1
Original line number Diff line number Diff line
@@ -343,7 +343,8 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw, 
					(bool)GET_RX_DESC_PAGGR(pdesc));

	rx_status->mactime = GET_RX_DESC_TSFL(pdesc);

	if (phystatus) {

		p_drvinfo = (struct rx_fwinfo_92c *)(pdesc + RTL_RX_DESC_SIZE);

		p_drvinfo = (struct rx_fwinfo_92c *)(skb->data +

						     stats->rx_bufshift);

		rtl92c_translate_rx_signal_stuff(hw, skb, stats, pdesc,

						 p_drvinfo);

	}

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -3518,7 +3518,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, 
		return -EINVAL;

	}

	band = chanctx_conf->def.chan->band;

	sta = sta_info_get(sdata, peer);

	sta = sta_info_get_bss(sdata, peer);

	if (sta) {

		qos = test_sta_flag(sta, WLAN_STA_WME);

	} else {