Commit f26cbf40 authored by Zhao, Gang's avatar Zhao, Gang Committed by Johannes Berg
Browse files

cfg80211: change wiphy_to_dev function name 



Name wiphy_to_rdev is more accurate to describe what the function
does, i.e., return a pointer pointing to struct
cfg80211_registered_device.

Signed-off-by: default avatarZhao, Gang <gamerh2o@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1b8ec87a

net/wireless/chan.c

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ bool cfg80211_reg_can_beacon(struct wiphy *wiphy, 
			     struct cfg80211_chan_def *chandef,

			     enum nl80211_iftype iftype)

{

	struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);

	bool res;

	u32 prohibited_flags = IEEE80211_CHAN_DISABLED |

			       IEEE80211_CHAN_RADAR;

net/wireless/core.c

+8 −8
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx) 


int get_wiphy_idx(struct wiphy *wiphy)

{

	struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);



	return rdev->wiphy_idx;

}
@@ -475,7 +475,7 @@ static int wiphy_verify_combinations(struct wiphy *wiphy) 


int wiphy_register(struct wiphy *wiphy)

{

	struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);

	int res;

	enum ieee80211_band band;

	struct ieee80211_supported_band *sband;
@@ -656,7 +656,7 @@ EXPORT_SYMBOL(wiphy_register); 


void wiphy_rfkill_start_polling(struct wiphy *wiphy)

{

	struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);



	if (!rdev->ops->rfkill_poll)

		return;
@@ -667,7 +667,7 @@ EXPORT_SYMBOL(wiphy_rfkill_start_polling); 


void wiphy_rfkill_stop_polling(struct wiphy *wiphy)

{

	struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);



	rfkill_pause_polling(rdev->rfkill);

}
@@ -675,7 +675,7 @@ EXPORT_SYMBOL(wiphy_rfkill_stop_polling); 


void wiphy_unregister(struct wiphy *wiphy)

{

	struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);



	wait_event(rdev->dev_wait, ({

		int __count;
@@ -748,7 +748,7 @@ EXPORT_SYMBOL(wiphy_free); 


void wiphy_rfkill_set_hw_state(struct wiphy *wiphy, bool blocked)

{

	struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);



	if (rfkill_set_hw_state(rdev->rfkill, blocked))

		schedule_work(&rdev->rfkill_sync);
@@ -757,7 +757,7 @@ EXPORT_SYMBOL(wiphy_rfkill_set_hw_state); 


void cfg80211_unregister_wdev(struct wireless_dev *wdev)

{

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

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



	ASSERT_RTNL();
@@ -841,7 +841,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, 
	if (!wdev)

		return NOTIFY_DONE;



	rdev = wiphy_to_dev(wdev->wiphy);

	rdev = wiphy_to_rdev(wdev->wiphy);



	WARN_ON(wdev->iftype == NL80211_IFTYPE_UNSPECIFIED);

net/wireless/core.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct cfg80211_registered_device { 
};



static inline

struct cfg80211_registered_device *wiphy_to_dev(struct wiphy *wiphy)

struct cfg80211_registered_device *wiphy_to_rdev(struct wiphy *wiphy)

{

	BUG_ON(!wiphy);

	return container_of(wiphy, struct cfg80211_registered_device, wiphy);

net/wireless/ethtool.c

+5 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void cfg80211_get_ringparam(struct net_device *dev, 
				   struct ethtool_ringparam *rp)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

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



	memset(rp, 0, sizeof(*rp));
@@ -56,7 +56,7 @@ static int cfg80211_set_ringparam(struct net_device *dev, 
				  struct ethtool_ringparam *rp)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

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



	if (rp->rx_mini_pending != 0 || rp->rx_jumbo_pending != 0)

		return -EINVAL;
@@ -70,7 +70,7 @@ static int cfg80211_set_ringparam(struct net_device *dev, 
static int cfg80211_get_sset_count(struct net_device *dev, int sset)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

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

	if (rdev->ops->get_et_sset_count)

		return rdev_get_et_sset_count(rdev, dev, sset);

	return -EOPNOTSUPP;
@@ -80,7 +80,7 @@ static void cfg80211_get_stats(struct net_device *dev, 
			       struct ethtool_stats *stats, u64 *data)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

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

	if (rdev->ops->get_et_stats)

		rdev_get_et_stats(rdev, dev, stats, data);

}
@@ -88,7 +88,7 @@ static void cfg80211_get_stats(struct net_device *dev, 
static void cfg80211_get_strings(struct net_device *dev, u32 sset, u8 *data)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

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

	if (rdev->ops->get_et_strings)

		rdev_get_et_strings(rdev, dev, sset, data);

}

net/wireless/ibss.c

+6 −6
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, 


	cfg80211_upload_connect_keys(wdev);



	nl80211_send_ibss_bssid(wiphy_to_dev(wdev->wiphy), dev, bssid,

	nl80211_send_ibss_bssid(wiphy_to_rdev(wdev->wiphy), dev, bssid,

				GFP_KERNEL);

#ifdef CONFIG_CFG80211_WEXT

	memset(&wrqu, 0, sizeof(wrqu));
@@ -58,7 +58,7 @@ void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, 
			  struct ieee80211_channel *channel, gfp_t gfp)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

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

	struct cfg80211_event *ev;

	unsigned long flags;
@@ -156,7 +156,7 @@ int cfg80211_join_ibss(struct cfg80211_registered_device *rdev, 
static void __cfg80211_clear_ibss(struct net_device *dev, bool nowext)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

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

	int i;



	ASSERT_WDEV_LOCK(wdev);
@@ -311,7 +311,7 @@ int cfg80211_ibss_wext_siwfreq(struct net_device *dev, 
			       struct iw_freq *wextfreq, char *extra)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

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

	struct ieee80211_channel *chan = NULL;

	int err, freq;
@@ -396,7 +396,7 @@ int cfg80211_ibss_wext_siwessid(struct net_device *dev, 
				struct iw_point *data, char *ssid)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

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

	size_t len = data->length;

	int err;
@@ -463,7 +463,7 @@ int cfg80211_ibss_wext_siwap(struct net_device *dev, 
			     struct sockaddr *ap_addr, char *extra)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

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

	u8 *bssid = ap_addr->sa_data;

	int err;