Commit 2e165b81 authored by Michal Kazior's avatar Michal Kazior Committed by Johannes Berg
Browse files

cfg80211/mac80211: remove .get_channel 



We do not need it anymore since cfg80211 tracks
monitor channel and monitor channel type.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a69b40a9

include/net/cfg80211.h

+0 −6
Original line number Diff line number Diff line
@@ -1501,9 +1501,6 @@ struct cfg80211_gtk_rekey_data { 
 *	be stored for when a monitor interface becomes active.

 * @set_monitor_enabled: Notify driver that there are only monitor

 *	interfaces running.

 * @get_channel: Get the current operating channel, should return %NULL if

 *	there's no single defined operating channel if for example the

 *	device implements channel hopping for multi-channel virtual interfaces.

 *

 * @scan: Request to do a scan. If returning zero, the scan request is given

 *	the driver, and will be valid until passed to cfg80211_scan_done().
@@ -1810,9 +1807,6 @@ struct cfg80211_ops { 
				  struct net_device *dev,

				  u16 noack_map);



	struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy,

					       enum nl80211_channel_type *type);



	int	(*get_et_sset_count)(struct wiphy *wiphy,

				     struct net_device *dev, int sset);

	void	(*get_et_stats)(struct wiphy *wiphy, struct net_device *dev,

net/mac80211/cfg.c

+0 −11
Original line number Diff line number Diff line
@@ -2980,16 +2980,6 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, 
	return 0;

}



static struct ieee80211_channel *

ieee80211_wiphy_get_channel(struct wiphy *wiphy,

			    enum nl80211_channel_type *type)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);



	*type = local->_oper_channel_type;

	return local->oper_channel;

}



static void ieee80211_set_monitor_enabled(struct wiphy *wiphy, bool enabled)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);
@@ -3073,7 +3063,6 @@ struct cfg80211_ops mac80211_config_ops = { 
	.tdls_oper = ieee80211_tdls_oper,

	.tdls_mgmt = ieee80211_tdls_mgmt,

	.probe_client = ieee80211_probe_client,

	.get_channel = ieee80211_wiphy_get_channel,

	.set_noack_map = ieee80211_set_noack_map,

	.set_monitor_enabled = ieee80211_set_monitor_enabled,

#ifdef CONFIG_PM

net/wireless/nl80211.c

+5 −10
Original line number Diff line number Diff line
@@ -1689,16 +1689,11 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags, 
			(cfg80211_rdev_list_generation << 2)))

		goto nla_put_failure;



	if (rdev->ops->get_channel) {

		struct ieee80211_channel *chan;

		enum nl80211_channel_type channel_type;



		chan = rdev->ops->get_channel(&rdev->wiphy, &channel_type);

		if (chan &&

		    (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,

				    chan->center_freq) ||

	if (rdev->monitor_channel) {

		if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,

				rdev->monitor_channel->center_freq) ||

		    nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,

				    channel_type)))

				rdev->monitor_channel_type))

			goto nla_put_failure;

	}

net/wireless/wext-compat.c

+2 −7
Original line number Diff line number Diff line
@@ -827,8 +827,6 @@ static int cfg80211_wext_giwfreq(struct net_device *dev, 
{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);

	struct ieee80211_channel *chan;

	enum nl80211_channel_type channel_type;



	switch (wdev->iftype) {

	case NL80211_IFTYPE_STATION:
@@ -836,13 +834,10 @@ static int cfg80211_wext_giwfreq(struct net_device *dev, 
	case NL80211_IFTYPE_ADHOC:

		return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);

	case NL80211_IFTYPE_MONITOR:

		if (!rdev->ops->get_channel)

		if (!rdev->monitor_channel)

			return -EINVAL;



		chan = rdev->ops->get_channel(wdev->wiphy, &channel_type);

		if (!chan)

			return -EINVAL;

		freq->m = chan->center_freq;

		freq->m = rdev->monitor_channel->center_freq;

		freq->e = 6;

		return 0;

	default: