diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 19:41:07 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 19:41:07 +0000 |
commit | 47f462d16716fdbcb24af448009d7c84f26c33d3 (patch) | |
tree | 3bb43623cbdd8222e53e7e2a9a85122ec6ce2adc /package/kernel/mac80211/patches/340-mac80211-add-support-for-driver-tx-power-reporting.patch | |
parent | b798df3e960f6bcb4910a4bee447ccadc0bb7d97 (diff) | |
download | upstream-47f462d16716fdbcb24af448009d7c84f26c33d3.tar.gz upstream-47f462d16716fdbcb24af448009d7c84f26c33d3.tar.bz2 upstream-47f462d16716fdbcb24af448009d7c84f26c33d3.zip |
mac80211: update to wireless-testing 2014-11-04
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43210 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/340-mac80211-add-support-for-driver-tx-power-reporting.patch')
-rw-r--r-- | package/kernel/mac80211/patches/340-mac80211-add-support-for-driver-tx-power-reporting.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/package/kernel/mac80211/patches/340-mac80211-add-support-for-driver-tx-power-reporting.patch b/package/kernel/mac80211/patches/340-mac80211-add-support-for-driver-tx-power-reporting.patch deleted file mode 100644 index 6998584a59..0000000000 --- a/package/kernel/mac80211/patches/340-mac80211-add-support-for-driver-tx-power-reporting.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Felix Fietkau <nbd@openwrt.org> -Date: Wed, 22 Oct 2014 17:55:50 +0200 -Subject: [PATCH] mac80211: add support for driver tx power reporting - -The configured tx power is often limited by hardware capabilities, -channel settings, antenna configuration, etc. - -Signed-off-by: Felix Fietkau <nbd@openwrt.org> ---- - ---- a/include/net/mac80211.h -+++ b/include/net/mac80211.h -@@ -2838,6 +2838,9 @@ enum ieee80211_roc_type { - * @get_expected_throughput: extract the expected throughput towards the - * specified station. The returned value is expressed in Kbps. It returns 0 - * if the RC algorithm does not have proper data to provide. -+ * -+ * @get_txpower: get current maximum tx power (in dBm) based on configuration -+ * and hardware limits. - */ - struct ieee80211_ops { - void (*tx)(struct ieee80211_hw *hw, -@@ -3039,6 +3042,8 @@ struct ieee80211_ops { - int (*join_ibss)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); - void (*leave_ibss)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); - u32 (*get_expected_throughput)(struct ieee80211_sta *sta); -+ int (*get_txpower)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -+ int *dbm); - }; - - /** ---- a/net/mac80211/cfg.c -+++ b/net/mac80211/cfg.c -@@ -2081,6 +2081,9 @@ static int ieee80211_get_tx_power(struct - struct ieee80211_local *local = wiphy_priv(wiphy); - struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); - -+ if (local->ops->get_txpower) -+ return local->ops->get_txpower(&local->hw, &sdata->vif, dbm); -+ - if (!local->use_chanctx) - *dbm = local->hw.conf.power_level; - else |