diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-06-18 13:17:03 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-12 06:10:41 -0400 |
commit | fd0142844efa85d89017c89227a0f03de1eee327 (patch) | |
tree | 2b9977f712df0caa3ecda6dd59fe5b34932e2ab6 /drivers/net/wireless/ath | |
parent | 1c90f9d404a45a1677c1e5791f5a2a8aaee0370a (diff) |
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: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 88bed02f7521..86aeef4b9d7e 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c | |||
@@ -966,11 +966,11 @@ static int ath6kl_set_probed_ssids(struct ath6kl *ar, | |||
966 | return 0; | 966 | return 0; |
967 | } | 967 | } |
968 | 968 | ||
969 | static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, | 969 | static int ath6kl_cfg80211_scan(struct wiphy *wiphy, |
970 | struct cfg80211_scan_request *request) | 970 | struct cfg80211_scan_request *request) |
971 | { | 971 | { |
972 | struct ath6kl *ar = ath6kl_priv(ndev); | 972 | struct ath6kl_vif *vif = ath6kl_vif_from_wdev(request->wdev); |
973 | struct ath6kl_vif *vif = netdev_priv(ndev); | 973 | struct ath6kl *ar = ath6kl_priv(vif->ndev); |
974 | s8 n_channels = 0; | 974 | s8 n_channels = 0; |
975 | u16 *channels = NULL; | 975 | u16 *channels = NULL; |
976 | int ret = 0; | 976 | int ret = 0; |