mac80211: ath9k: allow to load EEPROM data via firmware API

[openwrt.git] / package / mac80211 / patches / 523-mac80211_configure_antenna_gain.patch

diff --git a/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch b/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch
index 010fe6c..e1f17ff 100644 (file)
--- a/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch
+++ b/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch
@@ -47,10 +47,11 @@
  };
  
  /* policy for the key attributes */
-@@ -1652,6 +1653,22 @@ static int nl80211_set_wiphy(struct sk_b
+@@ -1651,6 +1652,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;
 +
@@ -66,10 +67,9 @@
 +              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
@@ -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 
+@@ -3241,6 +3254,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,
@@ -142,9 +142,9 @@
 +                      ant_gain = 0;
 +              } else
 +                      ant_gain -= local->user_antenna_gain;
++              power = min(power, max_power);
 +      }
 +
-+      power = min(chan->max_power, max_power);
 +      if (local->hw.conf.power_level != power ||
 +              local->hw.conf.max_antenna_gain != ant_gain) {
                changed |= IEEE80211_CONF_CHANGE_POWER;