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

Commit 8fca016d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cfg80211: Specify frame and reason code for NL80211_CMD_DEL_STATION"

parents 86739e96 8f3d883b

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

+2 −2
Original line number Diff line number Diff line
@@ -2976,11 +2976,11 @@ static int ath6kl_stop_ap(struct wiphy *wiphy, struct net_device *dev) 
static const u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };



static int ath6kl_del_station(struct wiphy *wiphy, struct net_device *dev,

			      const u8 *mac)

			      struct station_del_parameters *params)

{

	struct ath6kl *ar = ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);

	const u8 *addr = mac ? mac : bcast_addr;

	const u8 *addr = params->mac ? params->mac : bcast_addr;



	return ath6kl_wmi_ap_set_mlme(ar->wmi, vif->fw_vif_idx, WMI_AP_DEAUTH,

				      addr, WLAN_REASON_PREV_AUTH_NOT_VALID);

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

+5 −3
Original line number Diff line number Diff line
@@ -968,15 +968,17 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy, 
}



static int wil_cfg80211_del_station(struct wiphy *wiphy,

				    struct net_device *dev, const u8 *mac)

				    struct net_device *dev,

				    struct station_del_parameters *params)

{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);



	wil_dbg_misc(wil, "%s(%pM, reason=%d)\n", __func__, mac,

	wil_dbg_misc(wil, "%s(%pM, reason=%d)\n", __func__, (u8 *)params->mac,

		     WLAN_REASON_UNSPECIFIED);



	mutex_lock(&wil->mutex);

	wil6210_disconnect(wil, mac, WLAN_REASON_UNSPECIFIED, false);

	wil6210_disconnect(wil, (u8 *)params->mac, WLAN_REASON_UNSPECIFIED,

			   false);

	mutex_unlock(&wil->mutex);



	return 0;

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

+4 −4
Original line number Diff line number Diff line
@@ -4004,24 +4004,24 @@ brcmf_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *ndev, 


static int

brcmf_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev,

			   const u8 *mac)

			   struct station_del_parameters *params)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct brcmf_scb_val_le scbval;

	struct brcmf_if *ifp = netdev_priv(ndev);

	s32 err;



	if (!mac)

	if (!params->mac)

		return -EFAULT;



	brcmf_dbg(TRACE, "Enter %pM\n", mac);

	brcmf_dbg(TRACE, "Enter %pM\n", params->mac);



	if (ifp->vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif)

		ifp = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;

	if (!check_vif_up(ifp->vif))

		return -EIO;



	memcpy(&scbval.ea, mac, ETH_ALEN);

	memcpy(&scbval.ea, params->mac, ETH_ALEN);

	scbval.val = cpu_to_le32(WLAN_REASON_DEAUTH_LEAVING);

	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON,

				     &scbval, sizeof(scbval));

drivers/net/wireless/mwifiex/cfg80211.c

+5 −4
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ static int mwifiex_cfg80211_change_beacon(struct wiphy *wiphy, 
 */

static int

mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev,

			     const u8 *mac)

			     struct station_del_parameters *params)

{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	struct mwifiex_sta_node *sta_node;
@@ -1248,7 +1248,7 @@ mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, 
	if (list_empty(&priv->sta_list) || !priv->bss_started)

		return 0;



	if (!mac || is_broadcast_ether_addr(mac)) {

	if (!params->mac || is_broadcast_ether_addr(params->mac)) {

		wiphy_dbg(wiphy, "%s: NULL/broadcast mac address\n", __func__);

		list_for_each_entry(sta_node, &priv->sta_list, list) {

			if (mwifiex_send_cmd(priv, HostCmd_CMD_UAP_STA_DEAUTH,
@@ -1258,9 +1258,10 @@ mwifiex_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, 
			mwifiex_uap_del_sta_data(priv, sta_node);

		}

	} else {

		wiphy_dbg(wiphy, "%s: mac address %pM\n", __func__, mac);

		wiphy_dbg(wiphy, "%s: mac address %pM\n", __func__,

			  params->mac);

		spin_lock_irqsave(&priv->sta_list_spinlock, flags);

		sta_node = mwifiex_get_sta_entry(priv, mac);

		sta_node = mwifiex_get_sta_entry(priv, params->mac);

		spin_unlock_irqrestore(&priv->sta_list_spinlock, flags);

		if (sta_node) {

			if (mwifiex_send_cmd(priv, HostCmd_CMD_UAP_STA_DEAUTH,

drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c

+3 −1
Original line number Diff line number Diff line
@@ -2856,8 +2856,10 @@ static int cfg80211_rtw_add_station(struct wiphy *wiphy, 
}



static int cfg80211_rtw_del_station(struct wiphy *wiphy,

				    struct net_device *ndev, const u8 *mac)

				    struct net_device *ndev,

				    struct station_del_parameters *params)

{

	const u8 *mac = params->mac;

	int ret = 0;

	struct list_head *phead, *plist, *ptmp;

	u8 updated = 0;