cfg80211: move txpower wext from mac80211

This patch introduces new cfg80211 API to set the TX power
via cfg80211, puts the wext code into cfg80211 and updates
mac80211 to use all that. The -ENETDOWN bits are a hack but
will go away soon.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 80 insertions, 0 deletions

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 711e00a0c9b5..9fbfb8536e75 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -744,3 +744,83 @@ int cfg80211_wext_giwencode(struct net_device *dev,
         return err;
 }
 EXPORT_SYMBOL_GPL(cfg80211_wext_giwencode);
+
+int cfg80211_wext_siwtxpower(struct net_device *dev,
+                             struct iw_request_info *info,
+                             union iwreq_data *data, char *extra)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+        enum tx_power_setting type;
+        int dbm = 0;
+
+        if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM)
+                return -EINVAL;
+        if (data->txpower.flags & IW_TXPOW_RANGE)
+                return -EINVAL;
+
+        if (!rdev->ops->set_tx_power)
+                return -EOPNOTSUPP;
+
+        /* only change when not disabling */
+        if (!data->txpower.disabled) {
+                if (data->txpower.fixed) {
+                        /*
+                         * wext doesn't support negative values, see
+                         * below where it's for automatic
+                         */
+                        if (data->txpower.value < 0)
+                                return -EINVAL;
+                        dbm = data->txpower.value;
+                        type = TX_POWER_FIXED;
+                        /* TODO: do regulatory check! */
+                } else {
+                        /*
+                         * Automatic power level setting, max being the value
+                         * passed in from userland.
+                         */
+                        if (data->txpower.value < 0) {
+                                type = TX_POWER_AUTOMATIC;
+                        } else {
+                                dbm = data->txpower.value;
+                                type = TX_POWER_LIMITED;
+                        }
+                }
+        } else {
+                type = TX_POWER_OFF;
+        }
+
+        return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);;
+}
+EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower);
+
+int cfg80211_wext_giwtxpower(struct net_device *dev,
+                             struct iw_request_info *info,
+                             union iwreq_data *data, char *extra)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+        int err, val;
+
+        if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM)
+                return -EINVAL;
+        if (data->txpower.flags & IW_TXPOW_RANGE)
+                return -EINVAL;
+
+        if (!rdev->ops->get_tx_power)
+                return -EOPNOTSUPP;
+
+        err = rdev->ops->get_tx_power(wdev->wiphy, &val);
+        /* HACK!!! */
+        if (err && err != -ENETDOWN)
+                return err;
+
+        /* well... oh well */
+        data->txpower.fixed = 1;
+        data->txpower.disabled = err == -ENETDOWN;
+        data->txpower.value = val;
+        data->txpower.flags = IW_TXPOW_DBM;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cfg80211_wext_giwtxpower);