From b9a605b8bfce54c7f8e5d2989c3509783bc14738 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 1 Feb 2014 15:33:04 +0000 Subject: mac80211: merge upstream fixes Signed-off-by: Felix Fietkau SVN-Revision: 39442 --- .../kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch') 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, -- cgit v1.2.3