Commit e35e4d28 authored by Hila Gonen's avatar Hila Gonen Committed by Johannes Berg
Browse files

cfg80211: add wrappers for registered_device_ops 



This will allow adding central tracing like in mac80211.

Signed-off-by: default avatarHila Gonen <hila.gonen@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent de7044ee

net/wireless/ap.c

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <net/cfg80211.h>

#include "nl80211.h"

#include "core.h"

#include "rdev-ops.h"





static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
@@ -23,7 +24,7 @@ static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev, 
	if (!wdev->beacon_interval)

		return -ENOENT;



	err = rdev->ops->stop_ap(&rdev->wiphy, dev);

	err = rdev_stop_ap(rdev, dev);

	if (!err) {

		wdev->beacon_interval = 0;

		wdev->channel = NULL;

net/wireless/chan.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/export.h>

#include <net/cfg80211.h>

#include "core.h"

#include "rdev-ops.h"



struct ieee80211_channel *

rdev_freq_to_chan(struct cfg80211_registered_device *rdev,
@@ -92,7 +93,7 @@ int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev, 
	if (!chan)

		return -EINVAL;



	return rdev->ops->set_monitor_channel(&rdev->wiphy, chan, chantype);

	return rdev_set_monitor_channel(rdev, chan, chantype);

}



void

net/wireless/core.c

+5 −5
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "debugfs.h"

#include "wext-compat.h"

#include "ethtool.h"

#include "rdev-ops.h"



/* name for sysfs, %d is appended */

#define PHY_NAME "phy"
@@ -216,7 +217,7 @@ static void cfg80211_rfkill_poll(struct rfkill *rfkill, void *data) 
{

	struct cfg80211_registered_device *rdev = data;



	rdev->ops->rfkill_poll(&rdev->wiphy);

	rdev_rfkill_poll(rdev);

}



static int cfg80211_rfkill_set_block(void *data, bool blocked)
@@ -690,7 +691,7 @@ void wiphy_unregister(struct wiphy *wiphy) 
	flush_work(&rdev->event_work);



	if (rdev->wowlan && rdev->ops->set_wakeup)

		rdev->ops->set_wakeup(&rdev->wiphy, false);

		rdev_set_wakeup(rdev, false);

	cfg80211_rdev_free_wowlan(rdev);

}

EXPORT_SYMBOL(wiphy_unregister);
@@ -964,8 +965,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, 
		if ((wdev->iftype == NL80211_IFTYPE_STATION ||

		     wdev->iftype == NL80211_IFTYPE_P2P_CLIENT) &&

		    rdev->ops->set_power_mgmt)

			if (rdev->ops->set_power_mgmt(wdev->wiphy, dev,

						      wdev->ps,

			if (rdev_set_power_mgmt(rdev, dev, wdev->ps,

						wdev->ps_timeout)) {

				/* assume this means it's off */

				wdev->ps = false;

net/wireless/ethtool.c

+7 −8
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <net/cfg80211.h>

#include "core.h"

#include "ethtool.h"

#include "rdev-ops.h"



static void cfg80211_get_drvinfo(struct net_device *dev,

					struct ethtool_drvinfo *info)
@@ -47,8 +48,7 @@ static void cfg80211_get_ringparam(struct net_device *dev, 
	memset(rp, 0, sizeof(*rp));



	if (rdev->ops->get_ringparam)

		rdev->ops->get_ringparam(wdev->wiphy,

					 &rp->tx_pending, &rp->tx_max_pending,

		rdev_get_ringparam(rdev, &rp->tx_pending, &rp->tx_max_pending,

				   &rp->rx_pending, &rp->rx_max_pending);

}
@@ -62,8 +62,7 @@ static int cfg80211_set_ringparam(struct net_device *dev, 
		return -EINVAL;



	if (rdev->ops->set_ringparam)

		return rdev->ops->set_ringparam(wdev->wiphy,

						rp->tx_pending, rp->rx_pending);

		return rdev_set_ringparam(rdev, rp->tx_pending, rp->rx_pending);



	return -ENOTSUPP;

}
@@ -73,7 +72,7 @@ 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);

	if (rdev->ops->get_et_sset_count)

		return rdev->ops->get_et_sset_count(wdev->wiphy, dev, sset);

		return rdev_get_et_sset_count(rdev, dev, sset);

	return -EOPNOTSUPP;

}
@@ -83,7 +82,7 @@ static void cfg80211_get_stats(struct net_device *dev, 
	struct wireless_dev *wdev = dev->ieee80211_ptr;

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

	if (rdev->ops->get_et_stats)

		rdev->ops->get_et_stats(wdev->wiphy, dev, stats, data);

		rdev_get_et_stats(rdev, dev, stats, data);

}



static void cfg80211_get_strings(struct net_device *dev, u32 sset, u8 *data)
@@ -91,7 +90,7 @@ 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);

	if (rdev->ops->get_et_strings)

		rdev->ops->get_et_strings(wdev->wiphy, dev, sset, data);

		rdev_get_et_strings(rdev, dev, sset, data);

}



const struct ethtool_ops cfg80211_ethtool_ops = {

net/wireless/ibss.c

+4 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <net/cfg80211.h>

#include "wext-compat.h"

#include "nl80211.h"

#include "rdev-ops.h"





void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid)
@@ -128,7 +129,7 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev, 
		return err;

	}



	err = rdev->ops->join_ibss(&rdev->wiphy, dev, params);

	err = rdev_join_ibss(rdev, dev, params);

	if (err) {

		wdev->connect_keys = NULL;

		wdev->sme_state = CFG80211_SME_IDLE;
@@ -175,7 +176,7 @@ static void __cfg80211_clear_ibss(struct net_device *dev, bool nowext) 
	 */

	if (rdev->ops->del_key)

		for (i = 0; i < 6; i++)

			rdev->ops->del_key(wdev->wiphy, dev, i, false, NULL);

			rdev_del_key(rdev, dev, i, false, NULL);



	if (wdev->current_bss) {

		cfg80211_unhold_bss(wdev->current_bss);
@@ -211,7 +212,7 @@ int __cfg80211_leave_ibss(struct cfg80211_registered_device *rdev, 
	if (!wdev->ssid_len)

		return -ENOLINK;



	err = rdev->ops->leave_ibss(&rdev->wiphy, dev);

	err = rdev_leave_ibss(rdev, dev);



	if (err)

		return err;