diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-10 18:29:17 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-10 18:29:17 +0000 |
| commit | 3d534485d14551d757a1527ff2d2ce49b84f71d6 (patch) | |
| tree | 71c9b82e455c2a8e9632b127cdfd3ae6e8ac74f9 /package/mac80211/patches/523-mac80211_configure_antenna_gain.patch | |
| parent | 7e7f7d88cf772f529a3c56c816d2d3b11a7df398 (diff) | |
mac80211: fix channel context related warnings when using wds ap mode (fixes #12585)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34610 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/523-mac80211_configure_antenna_gain.patch')
| -rw-r--r-- | package/mac80211/patches/523-mac80211_configure_antenna_gain.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch b/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch index e1f17ff1d..844d4537b 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 */ -@@ -1651,6 +1652,22 @@ static int nl80211_set_wiphy(struct sk_b - if (result) +@@ -1652,6 +1653,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,12 +66,13 @@ + 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 -@@ -2118,6 +2118,19 @@ static int ieee80211_get_tx_power(struct +@@ -2127,6 +2127,19 @@ static int ieee80211_get_tx_power(struct return 0; } @@ -92,7 +92,7 @@ static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev, const u8 *addr) { -@@ -3241,6 +3254,7 @@ struct cfg80211_ops mac80211_config_ops +@@ -3250,6 +3263,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, |