diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-03-28 16:05:46 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-03-28 16:05:46 +0000 |
| commit | f5fce5e0da49d27caec70d64695b4a2d9bab8d44 (patch) | |
| tree | 707a261c8217721d108e24de57fb49c3a4d32878 /package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | |
| parent | 95a14e1dcdb790e3cb765ea605f0f41a45d3fbd1 (diff) | |
| download | mtk-20170518-f5fce5e0da49d27caec70d64695b4a2d9bab8d44.zip mtk-20170518-f5fce5e0da49d27caec70d64695b4a2d9bab8d44.tar.gz mtk-20170518-f5fce5e0da49d27caec70d64695b4a2d9bab8d44.tar.bz2 | |
mac80211: skip antenna gain when compiling regdb.txt (#15397)
The antenna gain attribute has been removed from the upstream regulatory database.
Incorperate patch from Luis R. Rodriguez to skip the parsing of the gain attribute
in genregdb.awk in order to emit proper rules again.
Also refresh fuzzy patches while we're at it.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 40296
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 | 10 |
1 files changed, 5 insertions, 5 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 308ee6e..8f2adc9 100644 --- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch +++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch @@ -77,7 +77,7 @@ static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev, const u8 *addr) { -@@ -3924,6 +3937,7 @@ struct cfg80211_ops mac80211_config_ops +@@ -3924,6 +3937,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, @@ -147,10 +147,11 @@ }; /* policy for the key attributes */ -@@ -2105,6 +2106,22 @@ static int nl80211_set_wiphy(struct sk_b +@@ -2104,6 +2105,22 @@ static int nl80211_set_wiphy(struct sk_b + if (result) goto bad_res; } - ++ + if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) { + int idx, dbi = 0; + @@ -166,7 +167,6 @@ + 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; |