diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-10-24 04:17:18 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-30 04:11:34 -0400 |
commit | c8442118ad9cd05cfe3b993f058e70ab25b1009a (patch) | |
tree | e9d454ef6461e70cf99de76f9dda52952b665e44 /net/wireless/wext-compat.c | |
parent | 71fe96bf9db8b117d28de6f9ced606cae2ad9661 (diff) |
cfg80211: allow per interface TX power setting
The TX power setting is currently per wiphy (hardware
device) but with multi-channel capabilities that doesn't
make much sense any more.
Allow drivers (and mac80211) to advertise support for
per-interface TX power configuration. When the TX power
is configured for the wiphy, the wdev will be NULL and
the driver can still handle that, but when a wdev is
given the TX power can be set only for that wdev now.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/wext-compat.c')
-rw-r--r-- | net/wireless/wext-compat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 6488d2dbc1d7..742ab6ec4c9d 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c | |||
@@ -895,7 +895,7 @@ static int cfg80211_wext_siwtxpower(struct net_device *dev, | |||
895 | return 0; | 895 | return 0; |
896 | } | 896 | } |
897 | 897 | ||
898 | return rdev_set_tx_power(rdev, type, DBM_TO_MBM(dbm)); | 898 | return rdev_set_tx_power(rdev, wdev, type, DBM_TO_MBM(dbm)); |
899 | } | 899 | } |
900 | 900 | ||
901 | static int cfg80211_wext_giwtxpower(struct net_device *dev, | 901 | static int cfg80211_wext_giwtxpower(struct net_device *dev, |
@@ -914,7 +914,7 @@ static int cfg80211_wext_giwtxpower(struct net_device *dev, | |||
914 | if (!rdev->ops->get_tx_power) | 914 | if (!rdev->ops->get_tx_power) |
915 | return -EOPNOTSUPP; | 915 | return -EOPNOTSUPP; |
916 | 916 | ||
917 | err = rdev_get_tx_power(rdev, &val); | 917 | err = rdev_get_tx_power(rdev, wdev, &val); |
918 | if (err) | 918 | if (err) |
919 | return err; | 919 | return err; |
920 | 920 | ||