diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-05 14:55:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-05 14:55:07 +0000 |
| commit | fcb680357e1e13500651473cd01e17316b2cd609 (patch) | |
| tree | b9d05c5cd2d591172df477a7049ea99e55eaddb4 /package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | |
| parent | b7ce76b4b9ee2f6ec567e66a98c85f4037b5c127 (diff) | |
| download | mtk-20170518-fcb680357e1e13500651473cd01e17316b2cd609.zip mtk-20170518-fcb680357e1e13500651473cd01e17316b2cd609.tar.gz mtk-20170518-fcb680357e1e13500651473cd01e17316b2cd609.tar.bz2 | |
mac80211: merge a series of cleanups/fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 41018
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.patch | 8 |
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 284d134..2109d2e 100644 --- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch +++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch @@ -8,7 +8,7 @@ * * @set_wds_peer: set the WDS peer for a WDS interface * -@@ -2441,6 +2442,7 @@ struct cfg80211_ops { +@@ -2431,6 +2432,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 -@@ -2401,6 +2401,19 @@ static int ieee80211_get_tx_power(struct +@@ -2094,6 +2094,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) { -@@ -3832,6 +3845,7 @@ const struct cfg80211_ops mac80211_confi +@@ -3517,6 +3530,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, @@ -87,7 +87,7 @@ CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd) --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1233,6 +1233,7 @@ struct ieee80211_local { +@@ -1243,6 +1243,7 @@ struct ieee80211_local { int dynamic_ps_forced_timeout; int user_power_level; /* in dBm, for all interfaces */ |