cfg80211: Convert del_station() callback to use a param struct
This makes it easier to add new parameters for the del_station calls without having to modify all drivers that use this. Change-Id: Ie3da671f0f41bf1d84dfd99cef87c06b91b522c5 CRs-Fixed: 743605 Git-commit: 89c771e5a62b856f4705f189892c489190edaec1 Git-repo: https://git.kernel.org/cgit/linux/kernel/git/linville/wireless-next.git Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> [asunka@codeaurora.org: resolve trivial merge conflicts and add flag CFG80211_DEL_STA_V2 in include/net/cfg80211.h for backward compatibility] Signed-off-by: Anand N Sunkad <asunka@codeaurora.org>
This commit is contained in:
parent
a66dc122a3
commit
63e4027fc0
|
@ -2977,11 +2977,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 const u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
|
||||||
|
|
||||||
static int ath6kl_del_station(struct wiphy *wiphy, struct net_device *dev,
|
static int ath6kl_del_station(struct wiphy *wiphy, struct net_device *dev,
|
||||||
u8 *mac)
|
struct station_del_parameters *params)
|
||||||
{
|
{
|
||||||
struct ath6kl *ar = ath6kl_priv(dev);
|
struct ath6kl *ar = ath6kl_priv(dev);
|
||||||
struct ath6kl_vif *vif = netdev_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,
|
return ath6kl_wmi_ap_set_mlme(ar->wmi, vif->fw_vif_idx, WMI_AP_DEAUTH,
|
||||||
addr, WLAN_REASON_PREV_AUTH_NOT_VALID);
|
addr, WLAN_REASON_PREV_AUTH_NOT_VALID);
|
||||||
|
|
|
@ -815,12 +815,14 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int wil_cfg80211_del_station(struct wiphy *wiphy,
|
static int wil_cfg80211_del_station(struct wiphy *wiphy,
|
||||||
struct net_device *dev, u8 *mac)
|
struct net_device *dev,
|
||||||
|
struct station_del_parameters *params)
|
||||||
{
|
{
|
||||||
struct wil6210_priv *wil = wiphy_to_wil(wiphy);
|
struct wil6210_priv *wil = wiphy_to_wil(wiphy);
|
||||||
|
|
||||||
mutex_lock(&wil->mutex);
|
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);
|
mutex_unlock(&wil->mutex);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -3918,24 +3918,24 @@ brcmf_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
||||||
|
|
||||||
static int
|
static int
|
||||||
brcmf_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev,
|
brcmf_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev,
|
||||||
u8 *mac)
|
struct station_del_parameters *params)
|
||||||
{
|
{
|
||||||
struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
|
struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
|
||||||
struct brcmf_scb_val_le scbval;
|
struct brcmf_scb_val_le scbval;
|
||||||
struct brcmf_if *ifp = netdev_priv(ndev);
|
struct brcmf_if *ifp = netdev_priv(ndev);
|
||||||
s32 err;
|
s32 err;
|
||||||
|
|
||||||
if (!mac)
|
if (!params->mac)
|
||||||
return -EFAULT;
|
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)
|
if (ifp->vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif)
|
||||||
ifp = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;
|
ifp = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;
|
||||||
if (!check_vif_up(ifp->vif))
|
if (!check_vif_up(ifp->vif))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
memcpy(&scbval.ea, mac, ETH_ALEN);
|
memcpy(&scbval.ea, params->mac, ETH_ALEN);
|
||||||
scbval.val = cpu_to_le32(WLAN_REASON_DEAUTH_LEAVING);
|
scbval.val = cpu_to_le32(WLAN_REASON_DEAUTH_LEAVING);
|
||||||
err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON,
|
err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON,
|
||||||
&scbval, sizeof(scbval));
|
&scbval, sizeof(scbval));
|
||||||
|
|
|
@ -62,6 +62,7 @@
|
||||||
struct wiphy;
|
struct wiphy;
|
||||||
|
|
||||||
#define TDLS_MGMT_VERSION2 1
|
#define TDLS_MGMT_VERSION2 1
|
||||||
|
#define CFG80211_DEL_STA_V2 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* wireless hardware capability structures
|
* wireless hardware capability structures
|
||||||
|
@ -698,6 +699,22 @@ struct station_parameters {
|
||||||
u8 supported_oper_classes_len;
|
u8 supported_oper_classes_len;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* struct station_del_parameters - station deletion parameters
|
||||||
|
*
|
||||||
|
* Used to delete a station entry (or all stations).
|
||||||
|
*
|
||||||
|
* @mac: MAC address of the station to remove or NULL to remove all stations
|
||||||
|
* @subtype: Management frame subtype to use for indicating removal
|
||||||
|
* (10 = Disassociation, 12 = Deauthentication)
|
||||||
|
* @reason_code: Reason code for the Disassociation/Deauthentication frame
|
||||||
|
*/
|
||||||
|
struct station_del_parameters {
|
||||||
|
const u8 *mac;
|
||||||
|
u8 subtype;
|
||||||
|
u16 reason_code;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* enum cfg80211_station_type - the type of station being modified
|
* enum cfg80211_station_type - the type of station being modified
|
||||||
* @CFG80211_STA_AP_CLIENT: client of an AP interface
|
* @CFG80211_STA_AP_CLIENT: client of an AP interface
|
||||||
|
@ -1914,7 +1931,7 @@ struct cfg80211_qos_map {
|
||||||
* @stop_ap: Stop being an AP, including stopping beaconing.
|
* @stop_ap: Stop being an AP, including stopping beaconing.
|
||||||
*
|
*
|
||||||
* @add_station: Add a new station.
|
* @add_station: Add a new station.
|
||||||
* @del_station: Remove a station; @mac may be NULL to remove all stations.
|
* @del_station: Remove a station
|
||||||
* @change_station: Modify a given station. Note that flags changes are not much
|
* @change_station: Modify a given station. Note that flags changes are not much
|
||||||
* validated in cfg80211, in particular the auth/assoc/authorized flags
|
* validated in cfg80211, in particular the auth/assoc/authorized flags
|
||||||
* might come to the driver in invalid combinations -- make sure to check
|
* might come to the driver in invalid combinations -- make sure to check
|
||||||
|
@ -2137,7 +2154,7 @@ struct cfg80211_ops {
|
||||||
int (*add_station)(struct wiphy *wiphy, struct net_device *dev,
|
int (*add_station)(struct wiphy *wiphy, struct net_device *dev,
|
||||||
u8 *mac, struct station_parameters *params);
|
u8 *mac, struct station_parameters *params);
|
||||||
int (*del_station)(struct wiphy *wiphy, struct net_device *dev,
|
int (*del_station)(struct wiphy *wiphy, struct net_device *dev,
|
||||||
u8 *mac);
|
struct station_del_parameters *params);
|
||||||
int (*change_station)(struct wiphy *wiphy, struct net_device *dev,
|
int (*change_station)(struct wiphy *wiphy, struct net_device *dev,
|
||||||
u8 *mac, struct station_parameters *params);
|
u8 *mac, struct station_parameters *params);
|
||||||
int (*get_station)(struct wiphy *wiphy, struct net_device *dev,
|
int (*get_station)(struct wiphy *wiphy, struct net_device *dev,
|
||||||
|
|
|
@ -1423,14 +1423,14 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,
|
static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,
|
||||||
u8 *mac)
|
struct station_del_parameters *params)
|
||||||
{
|
{
|
||||||
struct ieee80211_sub_if_data *sdata;
|
struct ieee80211_sub_if_data *sdata;
|
||||||
|
|
||||||
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
||||||
|
|
||||||
if (mac)
|
if (params->mac)
|
||||||
return sta_info_destroy_addr_bss(sdata, mac);
|
return sta_info_destroy_addr_bss(sdata, params->mac);
|
||||||
|
|
||||||
sta_info_flush(sdata);
|
sta_info_flush(sdata);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -4261,10 +4261,12 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info)
|
||||||
{
|
{
|
||||||
struct cfg80211_registered_device *rdev = info->user_ptr[0];
|
struct cfg80211_registered_device *rdev = info->user_ptr[0];
|
||||||
struct net_device *dev = info->user_ptr[1];
|
struct net_device *dev = info->user_ptr[1];
|
||||||
u8 *mac_addr = NULL;
|
struct station_del_parameters params;
|
||||||
|
|
||||||
|
memset(¶ms, 0, sizeof(params));
|
||||||
|
|
||||||
if (info->attrs[NL80211_ATTR_MAC])
|
if (info->attrs[NL80211_ATTR_MAC])
|
||||||
mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);
|
params.mac = nla_data(info->attrs[NL80211_ATTR_MAC]);
|
||||||
|
|
||||||
if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
|
if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
|
||||||
dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN &&
|
dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN &&
|
||||||
|
@ -4275,7 +4277,7 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info)
|
||||||
if (!rdev->ops->del_station)
|
if (!rdev->ops->del_station)
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
return rdev_del_station(rdev, dev, mac_addr);
|
return rdev_del_station(rdev, dev, ¶ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int nl80211_send_mpath(struct sk_buff *msg, u32 portid, u32 seq,
|
static int nl80211_send_mpath(struct sk_buff *msg, u32 portid, u32 seq,
|
||||||
|
|
|
@ -177,11 +177,12 @@ static inline int rdev_add_station(struct cfg80211_registered_device *rdev,
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int rdev_del_station(struct cfg80211_registered_device *rdev,
|
static inline int rdev_del_station(struct cfg80211_registered_device *rdev,
|
||||||
struct net_device *dev, u8 *mac)
|
struct net_device *dev,
|
||||||
|
struct station_del_parameters *params)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
trace_rdev_del_station(&rdev->wiphy, dev, mac);
|
trace_rdev_del_station(&rdev->wiphy, dev, params);
|
||||||
ret = rdev->ops->del_station(&rdev->wiphy, dev, mac);
|
ret = rdev->ops->del_station(&rdev->wiphy, dev, params);
|
||||||
trace_rdev_return_int(&rdev->wiphy, ret);
|
trace_rdev_return_int(&rdev->wiphy, ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -690,9 +690,28 @@ DECLARE_EVENT_CLASS(wiphy_netdev_mac_evt,
|
||||||
WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac))
|
WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac))
|
||||||
);
|
);
|
||||||
|
|
||||||
DEFINE_EVENT(wiphy_netdev_mac_evt, rdev_del_station,
|
DECLARE_EVENT_CLASS(station_del,
|
||||||
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, const u8 *mac),
|
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
|
||||||
TP_ARGS(wiphy, netdev, mac)
|
struct station_del_parameters *params),
|
||||||
|
TP_ARGS(wiphy, netdev, params),
|
||||||
|
TP_STRUCT__entry(
|
||||||
|
WIPHY_ENTRY
|
||||||
|
NETDEV_ENTRY
|
||||||
|
MAC_ENTRY(sta_mac)
|
||||||
|
),
|
||||||
|
TP_fast_assign(
|
||||||
|
WIPHY_ASSIGN;
|
||||||
|
NETDEV_ASSIGN;
|
||||||
|
MAC_ASSIGN(sta_mac, params->mac);
|
||||||
|
),
|
||||||
|
TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", station mac: " MAC_PR_FMT,
|
||||||
|
WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac))
|
||||||
|
);
|
||||||
|
|
||||||
|
DEFINE_EVENT(station_del, rdev_del_station,
|
||||||
|
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
|
||||||
|
struct station_del_parameters *params),
|
||||||
|
TP_ARGS(wiphy, netdev, params)
|
||||||
);
|
);
|
||||||
|
|
||||||
DEFINE_EVENT(wiphy_netdev_mac_evt, rdev_get_station,
|
DEFINE_EVENT(wiphy_netdev_mac_evt, rdev_get_station,
|
||||||
|
|
Loading…
Reference in New Issue