diff options
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index bd1f0cb56085..abe1d039be81 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -490,9 +490,12 @@ static int rndis_scan(struct wiphy *wiphy, | |||
490 | static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed); | 490 | static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed); |
491 | 491 | ||
492 | static int rndis_set_tx_power(struct wiphy *wiphy, | 492 | static int rndis_set_tx_power(struct wiphy *wiphy, |
493 | struct wireless_dev *wdev, | ||
493 | enum nl80211_tx_power_setting type, | 494 | enum nl80211_tx_power_setting type, |
494 | int mbm); | 495 | int mbm); |
495 | static int rndis_get_tx_power(struct wiphy *wiphy, int *dbm); | 496 | static int rndis_get_tx_power(struct wiphy *wiphy, |
497 | struct wireless_dev *wdev, | ||
498 | int *dbm); | ||
496 | 499 | ||
497 | static int rndis_connect(struct wiphy *wiphy, struct net_device *dev, | 500 | static int rndis_connect(struct wiphy *wiphy, struct net_device *dev, |
498 | struct cfg80211_connect_params *sme); | 501 | struct cfg80211_connect_params *sme); |
@@ -1903,6 +1906,7 @@ static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed) | |||
1903 | } | 1906 | } |
1904 | 1907 | ||
1905 | static int rndis_set_tx_power(struct wiphy *wiphy, | 1908 | static int rndis_set_tx_power(struct wiphy *wiphy, |
1909 | struct wireless_dev *wdev, | ||
1906 | enum nl80211_tx_power_setting type, | 1910 | enum nl80211_tx_power_setting type, |
1907 | int mbm) | 1911 | int mbm) |
1908 | { | 1912 | { |
@@ -1930,7 +1934,9 @@ static int rndis_set_tx_power(struct wiphy *wiphy, | |||
1930 | return -ENOTSUPP; | 1934 | return -ENOTSUPP; |
1931 | } | 1935 | } |
1932 | 1936 | ||
1933 | static int rndis_get_tx_power(struct wiphy *wiphy, int *dbm) | 1937 | static int rndis_get_tx_power(struct wiphy *wiphy, |
1938 | struct wireless_dev *wdev, | ||
1939 | int *dbm) | ||
1934 | { | 1940 | { |
1935 | struct rndis_wlan_private *priv = wiphy_priv(wiphy); | 1941 | struct rndis_wlan_private *priv = wiphy_priv(wiphy); |
1936 | struct usbnet *usbdev = priv->usbdev; | 1942 | struct usbnet *usbdev = priv->usbdev; |
@@ -2287,7 +2293,7 @@ static int rndis_join_ibss(struct wiphy *wiphy, struct net_device *dev, | |||
2287 | { | 2293 | { |
2288 | struct rndis_wlan_private *priv = wiphy_priv(wiphy); | 2294 | struct rndis_wlan_private *priv = wiphy_priv(wiphy); |
2289 | struct usbnet *usbdev = priv->usbdev; | 2295 | struct usbnet *usbdev = priv->usbdev; |
2290 | struct ieee80211_channel *channel = params->channel; | 2296 | struct ieee80211_channel *channel = params->chandef.chan; |
2291 | struct ndis_80211_ssid ssid; | 2297 | struct ndis_80211_ssid ssid; |
2292 | enum nl80211_auth_type auth_type; | 2298 | enum nl80211_auth_type auth_type; |
2293 | int ret, alg, length, chan = -1; | 2299 | int ret, alg, length, chan = -1; |