diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-07 22:05:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-07 22:05:36 +0000 |
| commit | b5a27f260bb5355e9d7f1bb91849913cff6ce84e (patch) | |
| tree | 704016795d359b530a350a90ae42d2622d74f237 /package/mac80211/patches/523-mac80211_configure_antenna_gain.patch | |
| parent | 97635d7a8e02a2fd5cdd41868e4d56d3ef62d8bb (diff) | |
| download | upstream-b5a27f260bb5355e9d7f1bb91849913cff6ce84e.tar.gz upstream-b5a27f260bb5355e9d7f1bb91849913cff6ce84e.tar.bz2 upstream-b5a27f260bb5355e9d7f1bb91849913cff6ce84e.zip | |
mac80211: merge an idle handling fix (fixes ath9k_htc client mode), refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36265
Diffstat (limited to 'package/mac80211/patches/523-mac80211_configure_antenna_gain.patch')
| -rw-r--r-- | package/mac80211/patches/523-mac80211_configure_antenna_gain.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch b/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch index 8c13f324af..99bd2e3ba5 100644 --- a/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch +++ b/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch @@ -47,11 +47,10 @@ }; /* policy for the key attributes */ -@@ -1705,6 +1706,22 @@ static int nl80211_set_wiphy(struct sk_b - if (result) +@@ -1706,6 +1707,22 @@ static int nl80211_set_wiphy(struct sk_b goto bad_res; } -+ + + if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) { + int idx, dbi = 0; + @@ -67,9 +66,10 @@ + if (result) + goto bad_res; + } - ++ if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] && info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) { + u32 tx_ant, rx_ant; --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2212,6 +2212,19 @@ static int ieee80211_get_tx_power(struct @@ -92,7 +92,7 @@ static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev, const u8 *addr) { -@@ -3375,6 +3388,7 @@ struct cfg80211_ops mac80211_config_ops +@@ -3375,6 +3388,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, |