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/rndis_wlan.c | |
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/rndis_wlan.c')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index dfcd02ab6ca..241162e8111 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -484,7 +484,7 @@ static int rndis_change_virtual_intf(struct wiphy *wiphy, | |||
484 | enum nl80211_iftype type, u32 *flags, | 484 | enum nl80211_iftype type, u32 *flags, |
485 | struct vif_params *params); | 485 | struct vif_params *params); |
486 | 486 | ||
487 | static int rndis_scan(struct wiphy *wiphy, struct net_device *dev, | 487 | static int rndis_scan(struct wiphy *wiphy, |
488 | struct cfg80211_scan_request *request); | 488 | struct cfg80211_scan_request *request); |
489 | 489 | ||
490 | static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed); | 490 | static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed); |
@@ -1941,9 +1941,10 @@ static int rndis_get_tx_power(struct wiphy *wiphy, int *dbm) | |||
1941 | } | 1941 | } |
1942 | 1942 | ||
1943 | #define SCAN_DELAY_JIFFIES (6 * HZ) | 1943 | #define SCAN_DELAY_JIFFIES (6 * HZ) |
1944 | static int rndis_scan(struct wiphy *wiphy, struct net_device *dev, | 1944 | static int rndis_scan(struct wiphy *wiphy, |
1945 | struct cfg80211_scan_request *request) | 1945 | struct cfg80211_scan_request *request) |
1946 | { | 1946 | { |
1947 | struct net_device *dev = request->wdev->netdev; | ||
1947 | struct usbnet *usbdev = netdev_priv(dev); | 1948 | struct usbnet *usbdev = netdev_priv(dev); |
1948 | struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev); | 1949 | struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev); |
1949 | int ret; | 1950 | int ret; |