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

Commit 71bbc994 authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: use wdev in mgmt-tx/ROC APIs 



The management frame and remain-on-channel APIs will be
needed in the P2P device abstraction, so move them over
to the new wdev-based APIs. Userspace can still use both
the interface index and wdev identifier for them so it's
backward compatible, but for the P2P Device wdev it will
be able to use the wdev identifier only.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ba22fb5b

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

+11 −11
Original line number Diff line number Diff line
@@ -2975,14 +2975,14 @@ static int ath6kl_change_station(struct wiphy *wiphy, struct net_device *dev, 
}



static int ath6kl_remain_on_channel(struct wiphy *wiphy,

				    struct net_device *dev,

				    struct wireless_dev *wdev,

				    struct ieee80211_channel *chan,

				    enum nl80211_channel_type channel_type,

				    unsigned int duration,

				    u64 *cookie)

{

	struct ath6kl *ar = ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);

	struct ath6kl_vif *vif = ath6kl_vif_from_wdev(wdev);

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

	u32 id;



	/* TODO: if already pending or ongoing remain-on-channel,
@@ -2999,11 +2999,11 @@ static int ath6kl_remain_on_channel(struct wiphy *wiphy, 
}



static int ath6kl_cancel_remain_on_channel(struct wiphy *wiphy,

					   struct net_device *dev,

					   struct wireless_dev *wdev,

					   u64 cookie)

{

	struct ath6kl *ar = ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);

	struct ath6kl_vif *vif = ath6kl_vif_from_wdev(wdev);

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



	if (cookie != vif->last_roc_id)

		return -ENOENT;
@@ -3134,15 +3134,15 @@ static bool ath6kl_is_p2p_go_ssid(const u8 *buf, size_t len) 
	return false;

}



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

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

			  struct ieee80211_channel *chan, bool offchan,

			  enum nl80211_channel_type channel_type,

			  bool channel_type_valid, unsigned int wait,

			  const u8 *buf, size_t len, bool no_cck,

			  bool dont_wait_for_ack, u64 *cookie)

{

	struct ath6kl *ar = ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);

	struct ath6kl_vif *vif = ath6kl_vif_from_wdev(wdev);

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

	u32 id;

	const struct ieee80211_mgmt *mgmt;

	bool more_data, queued;
@@ -3187,10 +3187,10 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct net_device *dev, 
}



static void ath6kl_mgmt_frame_register(struct wiphy *wiphy,

				       struct net_device *dev,

				       struct wireless_dev *wdev,

				       u16 frame_type, bool reg)

{

	struct ath6kl_vif *vif = netdev_priv(dev);

	struct ath6kl_vif *vif = ath6kl_vif_from_wdev(wdev);



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: frame_type=0x%x reg=%d\n",

		   __func__, frame_type, reg);

drivers/net/wireless/ath/ath6kl/core.h

+5 −0
Original line number Diff line number Diff line
@@ -589,6 +589,11 @@ struct ath6kl_vif { 
	struct list_head mc_filter;

};



static inline struct ath6kl_vif *ath6kl_vif_from_wdev(struct wireless_dev *wdev)

{

	return container_of(wdev, struct ath6kl_vif, wdev);

}



#define WOW_LIST_ID		0

#define WOW_HOST_REQ_DELAY	500 /* ms */

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

+5 −5
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static int ath6kl_wmi_remain_on_chnl_event_rx(struct wmi *wmi, u8 *datap, 
		return -EINVAL;

	}

	id = vif->last_roc_id;

	cfg80211_ready_on_channel(vif->ndev, id, chan, NL80211_CHAN_NO_HT,

	cfg80211_ready_on_channel(&vif->wdev, id, chan, NL80211_CHAN_NO_HT,

				  dur, GFP_ATOMIC);



	return 0;
@@ -513,7 +513,7 @@ static int ath6kl_wmi_cancel_remain_on_chnl_event_rx(struct wmi *wmi, 
	else

		id = vif->last_roc_id; /* timeout on uncanceled r-o-c */

	vif->last_cancel_roc_id = 0;

	cfg80211_remain_on_channel_expired(vif->ndev, id, chan,

	cfg80211_remain_on_channel_expired(&vif->wdev, id, chan,

					   NL80211_CHAN_NO_HT, GFP_ATOMIC);



	return 0;
@@ -533,7 +533,7 @@ static int ath6kl_wmi_tx_status_event_rx(struct wmi *wmi, u8 *datap, int len, 
	ath6kl_dbg(ATH6KL_DBG_WMI, "tx_status: id=%x ack_status=%u\n",

		   id, ev->ack_status);

	if (wmi->last_mgmt_tx_frame) {

		cfg80211_mgmt_tx_status(vif->ndev, id,

		cfg80211_mgmt_tx_status(&vif->wdev, id,

					wmi->last_mgmt_tx_frame,

					wmi->last_mgmt_tx_frame_len,

					!!ev->ack_status, GFP_ATOMIC);
@@ -568,7 +568,7 @@ static int ath6kl_wmi_rx_probe_req_event_rx(struct wmi *wmi, u8 *datap, int len, 
		   dlen, freq, vif->probe_req_report);



	if (vif->probe_req_report || vif->nw_type == AP_NETWORK)

		cfg80211_rx_mgmt(vif->ndev, freq, 0,

		cfg80211_rx_mgmt(&vif->wdev, freq, 0,

				 ev->data, dlen, GFP_ATOMIC);



	return 0;
@@ -608,7 +608,7 @@ static int ath6kl_wmi_rx_action_event_rx(struct wmi *wmi, u8 *datap, int len, 
		return -EINVAL;

	}

	ath6kl_dbg(ATH6KL_DBG_WMI, "rx_action: len=%u freq=%u\n", dlen, freq);

	cfg80211_rx_mgmt(vif->ndev, freq, 0,

	cfg80211_rx_mgmt(&vif->wdev, freq, 0,

			 ev->data, dlen, GFP_ATOMIC);



	return 0;

include/net/cfg80211.h

+13 −14
Original line number Diff line number Diff line
@@ -1753,23 +1753,23 @@ struct cfg80211_ops { 
	int	(*flush_pmksa)(struct wiphy *wiphy, struct net_device *netdev);



	int	(*remain_on_channel)(struct wiphy *wiphy,

				     struct net_device *dev,

				     struct wireless_dev *wdev,

				     struct ieee80211_channel *chan,

				     enum nl80211_channel_type channel_type,

				     unsigned int duration,

				     u64 *cookie);

	int	(*cancel_remain_on_channel)(struct wiphy *wiphy,

					    struct net_device *dev,

					    struct wireless_dev *wdev,

					    u64 cookie);



	int	(*mgmt_tx)(struct wiphy *wiphy, struct net_device *dev,

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

			  struct ieee80211_channel *chan, bool offchan,

			  enum nl80211_channel_type channel_type,

			  bool channel_type_valid, unsigned int wait,

			  const u8 *buf, size_t len, bool no_cck,

			  bool dont_wait_for_ack, u64 *cookie);

	int	(*mgmt_tx_cancel_wait)(struct wiphy *wiphy,

				       struct net_device *dev,

				       struct wireless_dev *wdev,

				       u64 cookie);



	int	(*set_power_mgmt)(struct wiphy *wiphy, struct net_device *dev,
@@ -1780,7 +1780,7 @@ struct cfg80211_ops { 
				       s32 rssi_thold, u32 rssi_hyst);



	void	(*mgmt_frame_register)(struct wiphy *wiphy,

				       struct net_device *dev,

				       struct wireless_dev *wdev,

				       u16 frame_type, bool reg);



	int	(*set_antenna)(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant);
@@ -3279,7 +3279,7 @@ void cfg80211_disconnected(struct net_device *dev, u16 reason, 


/**

 * cfg80211_ready_on_channel - notification of remain_on_channel start

 * @dev: network device

 * @wdev: wireless device

 * @cookie: the request cookie

 * @chan: The current channel (from remain_on_channel request)

 * @channel_type: Channel type
@@ -3287,21 +3287,20 @@ void cfg80211_disconnected(struct net_device *dev, u16 reason, 
 *	channel

 * @gfp: allocation flags

 */

void cfg80211_ready_on_channel(struct net_device *dev, u64 cookie,

void cfg80211_ready_on_channel(struct wireless_dev *wdev, u64 cookie,

			       struct ieee80211_channel *chan,

			       enum nl80211_channel_type channel_type,

			       unsigned int duration, gfp_t gfp);



/**

 * cfg80211_remain_on_channel_expired - remain_on_channel duration expired

 * @dev: network device

 * @wdev: wireless device

 * @cookie: the request cookie

 * @chan: The current channel (from remain_on_channel request)

 * @channel_type: Channel type

 * @gfp: allocation flags

 */

void cfg80211_remain_on_channel_expired(struct net_device *dev,

					u64 cookie,

void cfg80211_remain_on_channel_expired(struct wireless_dev *wdev, u64 cookie,

					struct ieee80211_channel *chan,

					enum nl80211_channel_type channel_type,

					gfp_t gfp);
@@ -3329,7 +3328,7 @@ void cfg80211_del_sta(struct net_device *dev, const u8 *mac_addr, gfp_t gfp); 


/**

 * cfg80211_rx_mgmt - notification of received, unprocessed management frame

 * @dev: network device

 * @wdev: wireless device receiving the frame

 * @freq: Frequency on which the frame was received in MHz

 * @sig_dbm: signal strength in mBm, or 0 if unknown

 * @buf: Management frame (header + body)
@@ -3344,12 +3343,12 @@ void cfg80211_del_sta(struct net_device *dev, const u8 *mac_addr, gfp_t gfp); 
 * This function is called whenever an Action frame is received for a station

 * mode interface, but is not processed in kernel.

 */

bool cfg80211_rx_mgmt(struct net_device *dev, int freq, int sig_dbm,

bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_dbm,

		      const u8 *buf, size_t len, gfp_t gfp);



/**

 * cfg80211_mgmt_tx_status - notification of TX status for management frame

 * @dev: network device

 * @wdev: wireless device receiving the frame

 * @cookie: Cookie returned by cfg80211_ops::mgmt_tx()

 * @buf: Management frame (header + body)

 * @len: length of the frame data
@@ -3360,7 +3359,7 @@ bool cfg80211_rx_mgmt(struct net_device *dev, int freq, int sig_dbm, 
 * transmitted with cfg80211_ops::mgmt_tx() to report the TX status of the

 * transmission attempt.

 */

void cfg80211_mgmt_tx_status(struct net_device *dev, u64 cookie,

void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,

			     const u8 *buf, size_t len, bool ack, gfp_t gfp);

net/mac80211/cfg.c

+10 −11
Original line number Diff line number Diff line
@@ -2299,13 +2299,13 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local, 
}



static int ieee80211_remain_on_channel(struct wiphy *wiphy,

				       struct net_device *dev,

				       struct wireless_dev *wdev,

				       struct ieee80211_channel *chan,

				       enum nl80211_channel_type channel_type,

				       unsigned int duration,

				       u64 *cookie)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);

	struct ieee80211_local *local = sdata->local;

	int ret;
@@ -2392,23 +2392,23 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local, 
}



static int ieee80211_cancel_remain_on_channel(struct wiphy *wiphy,

					      struct net_device *dev,

					      struct wireless_dev *wdev,

					      u64 cookie)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);

	struct ieee80211_local *local = sdata->local;



	return ieee80211_cancel_roc(local, cookie, false);

}



static int ieee80211_mgmt_tx(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,

			     enum nl80211_channel_type channel_type,

			     bool channel_type_valid, unsigned int wait,

			     const u8 *buf, size_t len, bool no_cck,

			     bool dont_wait_for_ack, u64 *cookie)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	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;
@@ -2513,21 +2513,20 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev, 
}



static int ieee80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,

					 struct net_device *dev,

					 struct wireless_dev *wdev,

					 u64 cookie)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_local *local = wiphy_priv(wiphy);



	return ieee80211_cancel_roc(local, cookie, true);

}



static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,

					  struct net_device *dev,

					  struct wireless_dev *wdev,

					  u16 frame_type, bool reg)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);



	switch (frame_type) {

	case IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH: