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

Commit b176e629 authored by Andrei Otcheretianski's avatar Andrei Otcheretianski Committed by Johannes Berg
Browse files

cfg80211: aggregate mgmt_tx parameters into a struct 



Change cfg80211 and mac80211 to use cfg80211_mgmt_tx_params
struct to aggregate parameters for mgmt_tx functions.
This makes the functions' signatures less clumsy and allows
less painful parameters extension.

Signed-off-by: default avatarAndrei Otcheretianski <andrei.otcheretianski@intel.com>
[fix all other drivers]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 017b45bb

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

+6 −3
Original line number Diff line number Diff line
@@ -3169,12 +3169,15 @@ static bool ath6kl_is_p2p_go_ssid(const u8 *buf, size_t len) 
}



static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,

			  struct ieee80211_channel *chan, bool offchan,

			  unsigned int wait, const u8 *buf, size_t len,

			  bool no_cck, bool dont_wait_for_ack, u64 *cookie)

			  struct cfg80211_mgmt_tx_params *params, u64 *cookie)

{

	struct ath6kl_vif *vif = ath6kl_vif_from_wdev(wdev);

	struct ath6kl *ar = ath6kl_priv(vif->ndev);

	struct ieee80211_channel *chan = params->chan;

	const u8 *buf = params->buf;

	size_t len = params->len;

	unsigned int wait = params->wait;

	bool no_cck = params->no_cck;

	u32 id, freq;

	const struct ieee80211_mgmt *mgmt;

	bool more_data, queued;

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

+4 −3
Original line number Diff line number Diff line
@@ -3973,11 +3973,12 @@ brcmf_cfg80211_mgmt_frame_register(struct wiphy *wiphy, 


static int

brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,

		       struct ieee80211_channel *chan, bool offchan,

		       unsigned int wait, const u8 *buf, size_t len,

		       bool no_cck, bool dont_wait_for_ack, u64 *cookie)

		       struct cfg80211_mgmt_tx_params *params, u64 *cookie)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct ieee80211_channel *chan = params->chan;

	const u8 *buf = params->buf;

	size_t len = params->len;

	const struct ieee80211_mgmt *mgmt;

	struct brcmf_cfg80211_vif *vif;

	s32 err = 0;

drivers/net/wireless/mwifiex/cfg80211.c

+3 −3
Original line number Diff line number Diff line
@@ -184,10 +184,10 @@ mwifiex_form_mgmt_frame(struct sk_buff *skb, const u8 *buf, size_t len) 
 */

static int

mwifiex_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,

			 struct ieee80211_channel *chan, bool offchan,

			 unsigned int wait, const u8 *buf, size_t len,

			 bool no_cck, bool dont_wait_for_ack, u64 *cookie)

			 struct cfg80211_mgmt_tx_params *params, u64 *cookie)

{

	const u8 *buf = params->buf;

	size_t len = params->len;

	struct sk_buff *skb;

	u16 pkt_len;

	const struct ieee80211_mgmt *mgmt;

include/net/cfg80211.h

+25 −3
Original line number Diff line number Diff line
@@ -1943,6 +1943,29 @@ struct cfg80211_update_ft_ies_params { 
	size_t ie_len;

};



/**

 * struct cfg80211_mgmt_tx_params - mgmt tx parameters

 *

 * This structure provides information needed to transmit a mgmt frame

 *

 * @chan: channel to use

 * @offchan: indicates wether off channel operation is required

 * @wait: duration for ROC

 * @buf: buffer to transmit

 * @len: buffer length

 * @no_cck: don't use cck rates for this frame

 * @dont_wait_for_ack: tells the low level not to wait for an ack

 */

struct cfg80211_mgmt_tx_params {

	struct ieee80211_channel *chan;

	bool offchan;

	unsigned int wait;

	const u8 *buf;

	size_t len;

	bool no_cck;

	bool dont_wait_for_ack;

};



/**

 * struct cfg80211_ops - backend description for wireless configuration

 *
@@ -2341,9 +2364,8 @@ struct cfg80211_ops { 
					    u64 cookie);



	int	(*mgmt_tx)(struct wiphy *wiphy, struct wireless_dev *wdev,

			  struct ieee80211_channel *chan, bool offchan,

			  unsigned int wait, const u8 *buf, size_t len,

			  bool no_cck, bool dont_wait_for_ack, u64 *cookie);

			   struct cfg80211_mgmt_tx_params *params,

			   u64 *cookie);

	int	(*mgmt_tx_cancel_wait)(struct wiphy *wiphy,

				       struct wireless_dev *wdev,

				       u64 cookie);

net/mac80211/cfg.c

+15 −14
Original line number Diff line number Diff line
@@ -3167,26 +3167,25 @@ static int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, 
}



static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,

			     struct ieee80211_channel *chan, bool offchan,

			     unsigned int wait, const u8 *buf, size_t len,

			     bool no_cck, bool dont_wait_for_ack, u64 *cookie)

			     struct cfg80211_mgmt_tx_params *params,

			     u64 *cookie)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);

	struct ieee80211_local *local = sdata->local;

	struct sk_buff *skb;

	struct sta_info *sta;

	const struct ieee80211_mgmt *mgmt = (void *)buf;

	const struct ieee80211_mgmt *mgmt = (void *)params->buf;

	bool need_offchan = false;

	u32 flags;

	int ret;



	if (dont_wait_for_ack)

	if (params->dont_wait_for_ack)

		flags = IEEE80211_TX_CTL_NO_ACK;

	else

		flags = IEEE80211_TX_INTFL_NL80211_FRAME_TX |

			IEEE80211_TX_CTL_REQ_TX_STATUS;



	if (no_cck)

	if (params->no_cck)

		flags |= IEEE80211_TX_CTL_NO_CCK_RATE;



	switch (sdata->vif.type) {
@@ -3234,7 +3233,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
	/* configurations requiring offchan cannot work if no channel has been

	 * specified

	 */

	if (need_offchan && !chan)

	if (need_offchan && !params->chan)

		return -EINVAL;



	mutex_lock(&local->mtx);
@@ -3247,8 +3246,10 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
		chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);



		if (chanctx_conf) {

			need_offchan = chan && (chan != chanctx_conf->def.chan);

		} else if (!chan) {

			need_offchan = params->chan &&

				       (params->chan !=

					chanctx_conf->def.chan);

		} else if (!params->chan) {

			ret = -EINVAL;

			rcu_read_unlock();

			goto out_unlock;
@@ -3258,19 +3259,19 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
		rcu_read_unlock();

	}



	if (need_offchan && !offchan) {

	if (need_offchan && !params->offchan) {

		ret = -EBUSY;

		goto out_unlock;

	}



	skb = dev_alloc_skb(local->hw.extra_tx_headroom + len);

	skb = dev_alloc_skb(local->hw.extra_tx_headroom + params->len);

	if (!skb) {

		ret = -ENOMEM;

		goto out_unlock;

	}

	skb_reserve(skb, local->hw.extra_tx_headroom);



	memcpy(skb_put(skb, len), buf, len);

	memcpy(skb_put(skb, params->len), params->buf, params->len);



	IEEE80211_SKB_CB(skb)->flags = flags;
@@ -3290,8 +3291,8 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
			local->hw.offchannel_tx_hw_queue;



	/* This will handle all kinds of coalescing and immediate TX */

	ret = ieee80211_start_roc_work(local, sdata, chan,

				       wait, cookie, skb,

	ret = ieee80211_start_roc_work(local, sdata, params->chan,

				       params->wait, cookie, skb,

				       IEEE80211_ROC_TYPE_MGMT_TX);

	if (ret)

		kfree_skb(skb);