cfg80211: allow per interface TX power setting

[deliverable/linux.git] / include / net / cfg80211.h

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index c6964572890ffe2407d88deb2f83c15bb97719ad..8034a4268fcb4440279c2c1ebcc0e46a4a41d650 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1551,7 +1551,10 @@ struct cfg80211_gtk_rekey_data {
  *     struct wiphy. If returning an error, no value should be changed.
  *
  * @set_tx_power: set the transmit power according to the parameters,
- *     the power passed is in mBm, to get dBm use MBM_TO_DBM().
+ *     the power passed is in mBm, to get dBm use MBM_TO_DBM(). The
+ *     wdev may be %NULL if power was set for the wiphy, and will
+ *     always be %NULL unless the driver supports per-vif TX power
+ *     (as advertised by the nl80211 feature flag.)
  * @get_tx_power: store the current TX power into the dbm variable;
  *     return 0 if successful
  *
@@ -1748,9 +1751,10 @@ struct cfg80211_ops {
 
        int     (*set_wiphy_params)(struct wiphy *wiphy, u32 changed);
 
-       int     (*set_tx_power)(struct wiphy *wiphy,
+       int     (*set_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
                                enum nl80211_tx_power_setting type, int mbm);
-       int     (*get_tx_power)(struct wiphy *wiphy, int *dbm);
+       int     (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
+                               int *dbm);
 
        int     (*set_wds_peer)(struct wiphy *wiphy, struct net_device *dev,
                                const u8 *addr);