Commit 9c4f8309 authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

wifi: cfg80211: pass net_device to .set_monitor_channel 



Preparation for allowing multiple monitor interfaces with different channels
on a multi-radio wiphy.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Link: https://patch.msgid.link/35fa652dbfebf93343f8b9a08fdef0467a2a02dc.1728462320.git-series.nbd@nbd.name


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

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

+1 −0
Original line number Diff line number Diff line
@@ -1493,6 +1493,7 @@ int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
}



static int wil_cfg80211_set_channel(struct wiphy *wiphy,

				    struct net_device *dev,

				    struct cfg80211_chan_def *chandef)

{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);

drivers/net/wireless/marvell/libertas/cfg.c

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ static int lbs_add_wps_enrollee_tlv(u8 *tlv, const u8 *ie, size_t ie_len) 
 */



static int lbs_cfg_set_monitor_channel(struct wiphy *wiphy,

				       struct net_device *dev,

				       struct cfg80211_chan_def *chandef)

{

	struct lbs_private *priv = wiphy_priv(wiphy);

drivers/net/wireless/microchip/wilc1000/cfg80211.c

+2 −1
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ struct wilc_vif *wilc_get_wl_to_vif(struct wilc *wl) 
}



static int set_channel(struct wiphy *wiphy,

		       struct net_device *dev,

		       struct cfg80211_chan_def *chandef)

{

	struct wilc *wl = wiphy_priv(wiphy);
@@ -1424,7 +1425,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev, 
	struct wilc_vif *vif = netdev_priv(dev);

	int ret;



	ret = set_channel(wiphy, &settings->chandef);

	ret = set_channel(wiphy, dev, &settings->chandef);

	if (ret != 0)

		netdev_err(dev, "Error in setting channel\n");

include/net/cfg80211.h

+1 −0
Original line number Diff line number Diff line
@@ -4694,6 +4694,7 @@ struct cfg80211_ops { 
					     struct ieee80211_channel *chan);



	int	(*set_monitor_channel)(struct wiphy *wiphy,

				       struct net_device *dev,

				       struct cfg80211_chan_def *chandef);



	int	(*scan)(struct wiphy *wiphy,

net/mac80211/cfg.c

+1 −0
Original line number Diff line number Diff line
@@ -897,6 +897,7 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev, 
}



static int ieee80211_set_monitor_channel(struct wiphy *wiphy,

					 struct net_device *dev,

					 struct cfg80211_chan_def *chandef)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);