Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8442118 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent 71fe96bf

drivers/net/wireless/ath/ath6kl/cfg80211.c

+4 −5
Original line number Diff line number Diff line
@@ -1384,11 +1384,8 @@ static int ath6kl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) 
	return 0;

}



/*

 * The type nl80211_tx_power_setting replaces the following

 * data type from 2.6.36 onwards

*/

static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,

				       struct wireless_dev *wdev,

				       enum nl80211_tx_power_setting type,

				       int mbm)

{
@@ -1423,7 +1420,9 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy, 
	return 0;

}



static int ath6kl_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm)

static int ath6kl_cfg80211_get_txpower(struct wiphy *wiphy,

				       struct wireless_dev *wdev,

				       int *dbm)

{

	struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);

	struct ath6kl_vif *vif;

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+4 −2
Original line number Diff line number Diff line
@@ -1721,7 +1721,7 @@ brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev, 
}



static s32

brcmf_cfg80211_set_tx_power(struct wiphy *wiphy,

brcmf_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,

			    enum nl80211_tx_power_setting type, s32 mbm)

{
@@ -1770,7 +1770,9 @@ brcmf_cfg80211_set_tx_power(struct wiphy *wiphy, 
	return err;

}



static s32 brcmf_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm)

static s32 brcmf_cfg80211_get_tx_power(struct wiphy *wiphy,

				       struct wireless_dev *wdev,

				       s32 *dbm)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));

drivers/net/wireless/mwifiex/cfg80211.c

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ mwifiex_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, 
 */

static int

mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy,

			      struct wireless_dev *wdev,

			      enum nl80211_tx_power_setting type,

			      int mbm)

{

drivers/net/wireless/rndis_wlan.c

+8 −2
Original line number Diff line number Diff line
@@ -490,9 +490,12 @@ static int rndis_scan(struct wiphy *wiphy, 
static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed);



static int rndis_set_tx_power(struct wiphy *wiphy,

			      struct wireless_dev *wdev,

			      enum nl80211_tx_power_setting type,

			      int mbm);

static int rndis_get_tx_power(struct wiphy *wiphy, int *dbm);

static int rndis_get_tx_power(struct wiphy *wiphy,

			      struct wireless_dev *wdev,

			      int *dbm);



static int rndis_connect(struct wiphy *wiphy, struct net_device *dev,

				struct cfg80211_connect_params *sme);
@@ -1903,6 +1906,7 @@ static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed) 
}



static int rndis_set_tx_power(struct wiphy *wiphy,

			      struct wireless_dev *wdev,

			      enum nl80211_tx_power_setting type,

			      int mbm)

{
@@ -1930,7 +1934,9 @@ static int rndis_set_tx_power(struct wiphy *wiphy, 
	return -ENOTSUPP;

}



static int rndis_get_tx_power(struct wiphy *wiphy, int *dbm)

static int rndis_get_tx_power(struct wiphy *wiphy,

			      struct wireless_dev *wdev,

			      int *dbm)

{

	struct rndis_wlan_private *priv = wiphy_priv(wiphy);

	struct usbnet *usbdev = priv->usbdev;

include/net/cfg80211.h

+7 −3
Original line number Diff line number Diff line
@@ -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);