aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/wlan-ng
diff options
context:
space:
mode:
authorChristoph Fritz <chf.fritz@googlemail.com>2010-08-02 21:53:35 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-05 14:18:29 -0700
commit9015e4996273c86574d6fd26df8a203941d3cc24 (patch)
treeaf94e53d73917ed64e40523e67b1f0afc2890ab0 /drivers/staging/wlan-ng
parentStaging: Merge staging-next into Linus's tree (diff)
downloadlinux-dev-9015e4996273c86574d6fd26df8a203941d3cc24.tar.xz
linux-dev-9015e4996273c86574d6fd26df8a203941d3cc24.zip
Staging: wlan-ng: Update prism2_set_tx_power() to use mBm
Commit fa61cf70a6ae1089e459e4b59b2e8d8e90d8535e updates nl80211's function .set_tx_power to use mBm units instead of dBm for greater accuracy and smaller power levels. This patchs updates prism2_set_tx_power() accordingly. Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng')
-rw-r--r--drivers/staging/wlan-ng/cfg80211.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index d32875a7ef94..368c30a9d5ff 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -621,8 +621,8 @@ int prism2_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
}
-int prism2_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type,
- int dbm)
+int prism2_set_tx_power(struct wiphy *wiphy, enum nl80211_tx_power_setting type,
+ int mbm)
{
struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
wlandevice_t *wlandev = priv->wlandev;
@@ -630,10 +630,10 @@ int prism2_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type,
int result;
int err = 0;
- if (type == TX_POWER_AUTOMATIC)
+ if (type == NL80211_TX_POWER_AUTOMATIC)
data = 30;
else
- data = dbm;
+ data = MBM_TO_DBM(mbm);
result = prism2_domibset_uint32(wlandev,
DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel,