diff options
Diffstat (limited to 'net/wireless/wext-compat.c')
| -rw-r--r-- | net/wireless/wext-compat.c | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 96342993cf93..bb5e0a5ecfa1 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c  | |||
| @@ -829,7 +829,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev, | |||
| 829 | { | 829 | { | 
| 830 | struct wireless_dev *wdev = dev->ieee80211_ptr; | 830 | struct wireless_dev *wdev = dev->ieee80211_ptr; | 
| 831 | struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); | 831 | struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); | 
| 832 | enum tx_power_setting type; | 832 | enum nl80211_tx_power_setting type; | 
| 833 | int dbm = 0; | 833 | int dbm = 0; | 
| 834 | 834 | ||
| 835 | if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) | 835 | if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) | 
| @@ -852,7 +852,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev, | |||
| 852 | if (data->txpower.value < 0) | 852 | if (data->txpower.value < 0) | 
| 853 | return -EINVAL; | 853 | return -EINVAL; | 
| 854 | dbm = data->txpower.value; | 854 | dbm = data->txpower.value; | 
| 855 | type = TX_POWER_FIXED; | 855 | type = NL80211_TX_POWER_FIXED; | 
| 856 | /* TODO: do regulatory check! */ | 856 | /* TODO: do regulatory check! */ | 
| 857 | } else { | 857 | } else { | 
| 858 | /* | 858 | /* | 
| @@ -860,10 +860,10 @@ int cfg80211_wext_siwtxpower(struct net_device *dev, | |||
| 860 | * passed in from userland. | 860 | * passed in from userland. | 
| 861 | */ | 861 | */ | 
| 862 | if (data->txpower.value < 0) { | 862 | if (data->txpower.value < 0) { | 
| 863 | type = TX_POWER_AUTOMATIC; | 863 | type = NL80211_TX_POWER_AUTOMATIC; | 
| 864 | } else { | 864 | } else { | 
| 865 | dbm = data->txpower.value; | 865 | dbm = data->txpower.value; | 
| 866 | type = TX_POWER_LIMITED; | 866 | type = NL80211_TX_POWER_LIMITED; | 
| 867 | } | 867 | } | 
| 868 | } | 868 | } | 
| 869 | } else { | 869 | } else { | 
| @@ -872,7 +872,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev, | |||
| 872 | return 0; | 872 | return 0; | 
| 873 | } | 873 | } | 
| 874 | 874 | ||
| 875 | return rdev->ops->set_tx_power(wdev->wiphy, type, dbm); | 875 | return rdev->ops->set_tx_power(wdev->wiphy, type, DBM_TO_MBM(dbm)); | 
| 876 | } | 876 | } | 
| 877 | EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower); | 877 | EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower); | 
| 878 | 878 | ||
| @@ -1471,6 +1471,7 @@ int cfg80211_wext_siwpmksa(struct net_device *dev, | |||
| 1471 | return -EOPNOTSUPP; | 1471 | return -EOPNOTSUPP; | 
| 1472 | } | 1472 | } | 
| 1473 | } | 1473 | } | 
| 1474 | EXPORT_SYMBOL_GPL(cfg80211_wext_siwpmksa); | ||
| 1474 | 1475 | ||
| 1475 | static const iw_handler cfg80211_handlers[] = { | 1476 | static const iw_handler cfg80211_handlers[] = { | 
| 1476 | [IW_IOCTL_IDX(SIOCGIWNAME)] = (iw_handler) cfg80211_wext_giwname, | 1477 | [IW_IOCTL_IDX(SIOCGIWNAME)] = (iw_handler) cfg80211_wext_giwname, | 
