summaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-05-23 18:48:35 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-05-23 18:48:35 +0000
commitca49c000b6f0dc520921f102f05f4b281664b897 (patch)
treebb3a63f0026077aebf11695ba66f64571bd704bd /package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
parent32d1e0ed2c3ec748bf7759a31d363e38d15b2424 (diff)
downloadmaster-31e0f0ae-ca49c000b6f0dc520921f102f05f4b281664b897.tar.gz
master-31e0f0ae-ca49c000b6f0dc520921f102f05f4b281664b897.tar.bz2
master-31e0f0ae-ca49c000b6f0dc520921f102f05f4b281664b897.zip
mac80211: update to wireless-testing 2014-05-22
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 40834
Diffstat (limited to 'package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch')
-rw-r--r--package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
index 6ad04aca33..284d134777 100644
--- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
+++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
@@ -1,6 +1,6 @@
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -2188,6 +2188,7 @@ struct cfg80211_qos_map {
+@@ -2207,6 +2207,7 @@ struct cfg80211_qos_map {
* (as advertised by the nl80211 feature flag.)
* @get_tx_power: store the current TX power into the dbm variable;
* return 0 if successful
@@ -8,7 +8,7 @@
*
* @set_wds_peer: set the WDS peer for a WDS interface
*
-@@ -2422,6 +2423,7 @@ struct cfg80211_ops {
+@@ -2441,6 +2442,7 @@ struct cfg80211_ops {
enum nl80211_tx_power_setting type, int mbm);
int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
int *dbm);
@@ -57,7 +57,7 @@
__NL80211_ATTR_AFTER_LAST,
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -2388,6 +2388,19 @@ static int ieee80211_get_tx_power(struct
+@@ -2401,6 +2401,19 @@ static int ieee80211_get_tx_power(struct
return 0;
}
@@ -77,7 +77,7 @@
static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
const u8 *addr)
{
-@@ -3820,6 +3833,7 @@ const struct cfg80211_ops mac80211_confi
+@@ -3832,6 +3845,7 @@ const struct cfg80211_ops mac80211_confi
.set_wiphy_params = ieee80211_set_wiphy_params,
.set_tx_power = ieee80211_set_tx_power,
.get_tx_power = ieee80211_get_tx_power,