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

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

Merge tag 'mac80211-next-for-davem-2015-05-29' of... 

Merge tag 'mac80211-next-for-davem-2015-05-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
As we get closer to the merge window, here are a few
more things for -next:
 * disconnect TDLS stations on CSA to avoid issues
 * fix a memory leak introduced in a recent commit
 * switch rfkill and cfg80211 to PM ops
 * in an unlikely scenario, prevent a bookkeeping
   value to get corrupted leading to dropped packets
 * fix a crash in VLAN assignment
 * switch rfkill-gpio to more modern gpiod API
 * send disconnected event to userspace with proper
   local/remote indication
====================

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

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason, 
					GFP_KERNEL);

	} else if (vif->sme_state == SME_CONNECTED) {

		cfg80211_disconnected(vif->ndev, proto_reason,

				      NULL, 0, GFP_KERNEL);

				      NULL, 0, false, GFP_KERNEL);

	}



	vif->sme_state = SME_DISCONNECTED;
@@ -3467,7 +3467,7 @@ void ath6kl_cfg80211_stop(struct ath6kl_vif *vif) 
					GFP_KERNEL);

		break;

	case SME_CONNECTED:

		cfg80211_disconnected(vif->ndev, 0, NULL, 0, GFP_KERNEL);

		cfg80211_disconnected(vif->ndev, 0, NULL, 0, true, GFP_KERNEL);

		break;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid, 
		if (test_bit(wil_status_fwconnected, wil->status)) {

			clear_bit(wil_status_fwconnected, wil->status);

			cfg80211_disconnected(ndev, reason_code,

					      NULL, 0, GFP_KERNEL);

					      NULL, 0, false, GFP_KERNEL);

		} else if (test_bit(wil_status_fwconnecting, wil->status)) {

			cfg80211_connect_result(ndev, bssid, NULL, 0, NULL, 0,

						WLAN_STATUS_UNSPECIFIED_FAILURE,

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

+2 −2
Original line number Diff line number Diff line
@@ -1296,7 +1296,7 @@ static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason) 
		}

		clear_bit(BRCMF_VIF_STATUS_CONNECTED, &vif->sme_state);

		cfg80211_disconnected(vif->wdev.netdev, reason, NULL, 0,

				      GFP_KERNEL);

				      true, GFP_KERNEL);



	}

	clear_bit(BRCMF_VIF_STATUS_CONNECTING, &vif->sme_state);
@@ -1962,7 +1962,7 @@ brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev, 


	clear_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state);

	clear_bit(BRCMF_VIF_STATUS_CONNECTING, &ifp->vif->sme_state);

	cfg80211_disconnected(ndev, reason_code, NULL, 0, GFP_KERNEL);

	cfg80211_disconnected(ndev, reason_code, NULL, 0, true, GFP_KERNEL);



	memcpy(&scbval.ea, &profile->bssid, ETH_ALEN);

	scbval.val = cpu_to_le32(reason_code);

drivers/net/wireless/libertas/cfg.c

+6 −7
Original line number Diff line number Diff line
@@ -835,13 +835,12 @@ static int lbs_cfg_scan(struct wiphy *wiphy, 
 * Events

 */



void lbs_send_disconnect_notification(struct lbs_private *priv)

void lbs_send_disconnect_notification(struct lbs_private *priv,

				      bool locally_generated)

{

	lbs_deb_enter(LBS_DEB_CFG80211);



	cfg80211_disconnected(priv->dev,

		0,

		NULL, 0,

	cfg80211_disconnected(priv->dev, 0, NULL, 0, locally_generated,

			      GFP_KERNEL);



	lbs_deb_leave(LBS_DEB_CFG80211);
@@ -1458,7 +1457,7 @@ int lbs_disconnect(struct lbs_private *priv, u16 reason) 


	cfg80211_disconnected(priv->dev,

			reason,

			NULL, 0,

			NULL, 0, true,

			GFP_KERNEL);

	priv->connect_status = LBS_DISCONNECTED;
@@ -2031,7 +2030,7 @@ static int lbs_leave_ibss(struct wiphy *wiphy, struct net_device *dev) 
	ret = lbs_cmd_with_response(priv, CMD_802_11_AD_HOC_STOP, &cmd);



	/* TODO: consider doing this at MACREG_INT_CODE_ADHOC_BCN_LOST time */

	lbs_mac_event_disconnected(priv);

	lbs_mac_event_disconnected(priv, true);



	lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);

	return ret;

drivers/net/wireless/libertas/cfg.h

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ struct wireless_dev *lbs_cfg_alloc(struct device *dev); 
int lbs_cfg_register(struct lbs_private *priv);

void lbs_cfg_free(struct lbs_private *priv);



void lbs_send_disconnect_notification(struct lbs_private *priv);

void lbs_send_disconnect_notification(struct lbs_private *priv,

				      bool locally_generated);

void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event);



void lbs_scan_done(struct lbs_private *priv);