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

Commit fd014284 authored by Johannes Berg's avatar Johannes Berg
Browse files

nl80211: move scan API to wdev 



The new P2P Device will have to be able to scan for
P2P search, so move scanning to use struct wireless_dev
instead of struct net_device.

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

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

+3 −3
Original line number Diff line number Diff line
@@ -966,11 +966,11 @@ static int ath6kl_set_probed_ssids(struct ath6kl *ar, 
	return 0;

}



static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,

static int ath6kl_cfg80211_scan(struct wiphy *wiphy,

				struct cfg80211_scan_request *request)

{

	struct ath6kl *ar = ath6kl_priv(ndev);

	struct ath6kl_vif *vif = netdev_priv(ndev);

	struct ath6kl_vif *vif = ath6kl_vif_from_wdev(request->wdev);

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

	s8 n_channels = 0;

	u16 *channels = NULL;

	int ret = 0;

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+2 −1
Original line number Diff line number Diff line
@@ -691,9 +691,10 @@ __brcmf_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, 
}



static s32

brcmf_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,

brcmf_cfg80211_scan(struct wiphy *wiphy,

		 struct cfg80211_scan_request *request)

{

	struct net_device *ndev = request->wdev->netdev;

	s32 err = 0;



	WL_TRACE("Enter\n");

drivers/net/wireless/iwmc3200wifi/cfg80211.c

+2 −1
Original line number Diff line number Diff line
@@ -353,9 +353,10 @@ static int iwm_cfg80211_change_iface(struct wiphy *wiphy, 
	return 0;

}



static int iwm_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,

static int iwm_cfg80211_scan(struct wiphy *wiphy,

			     struct cfg80211_scan_request *request)

{

	struct net_device *ndev = request->wdev->netdev;

	struct iwm_priv *iwm = ndev_to_iwm(ndev);

	int ret;

drivers/net/wireless/libertas/cfg.c

+0 −1
Original line number Diff line number Diff line
@@ -805,7 +805,6 @@ void lbs_scan_done(struct lbs_private *priv) 
}



static int lbs_cfg_scan(struct wiphy *wiphy,

	struct net_device *dev,

	struct cfg80211_scan_request *request)

{

	struct lbs_private *priv = wiphy_priv(wiphy);

drivers/net/wireless/mwifiex/cfg80211.c

+2 −1
Original line number Diff line number Diff line
@@ -1376,9 +1376,10 @@ mwifiex_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev) 
 * it also informs the results.

 */

static int

mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev,

mwifiex_cfg80211_scan(struct wiphy *wiphy,

		      struct cfg80211_scan_request *request)

{

	struct net_device *dev = request->wdev->netdev;

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	int i;

	struct ieee80211_channel *chan;