diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-02-01 15:33:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-02-01 15:33:04 +0000 |
| commit | b9a605b8bfce54c7f8e5d2989c3509783bc14738 (patch) | |
| tree | a6326b141b7ad0c05aa5ff367188519d5956a5e4 /package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | |
| parent | 8fa06b7e3cfbd7d120a053c05272b33e180da90f (diff) | |
| download | master-31e0f0ae-b9a605b8bfce54c7f8e5d2989c3509783bc14738.tar.gz master-31e0f0ae-b9a605b8bfce54c7f8e5d2989c3509783bc14738.tar.bz2 master-31e0f0ae-b9a605b8bfce54c7f8e5d2989c3509783bc14738.zip | |
mac80211: merge upstream fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39442
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 | 4 |
1 files changed, 2 insertions, 2 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 76a7ea6db8..0106b43507 100644 --- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch +++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch @@ -57,7 +57,7 @@ __NL80211_ATTR_AFTER_LAST, --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2333,6 +2333,19 @@ static int ieee80211_get_tx_power(struct +@@ -2336,6 +2336,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) { -@@ -3916,6 +3929,7 @@ struct cfg80211_ops mac80211_config_ops +@@ -3921,6 +3934,7 @@ struct cfg80211_ops mac80211_config_ops .set_wiphy_params = ieee80211_set_wiphy_params, .set_tx_power = ieee80211_set_tx_power, .get_tx_power = ieee80211_get_tx_power, |