mac80211: update to version based on 4.19-rc4

[openwrt/staging/mkresin.git] / package / kernel / mac80211 / patches / ath / 356-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch

diff --git a/package/kernel/mac80211/patches/ath/356-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch b/package/kernel/mac80211/patches/ath/356-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch
index 35d07430eb732f403c03dceabfbc7eb752c92335..3adcb8b7964421661a58607785f936689782e016 100644 (file)
--- a/package/kernel/mac80211/patches/ath/356-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch
+++ b/package/kernel/mac80211/patches/ath/356-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch
@@ -8,17 +8,17 @@ This reverts commit 71f5137bf010c6faffab50c0ec15374c59c4a411.
 
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2935,7 +2935,8 @@ void ath9k_hw_apply_txpower(struct ath_h
+@@ -2962,7 +2962,8 @@ void ath9k_hw_apply_txpower(struct ath_h
  {
        struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
        struct ieee80211_channel *channel;
 -      int chan_pwr, new_pwr;
 +      int chan_pwr, new_pwr, max_gain;
 +      int ant_gain, ant_reduction = 0;
+       u16 ctl = NO_CTL;
  
        if (!chan)
-               return;
-@@ -2943,10 +2944,15 @@ void ath9k_hw_apply_txpower(struct ath_h
+@@ -2974,9 +2975,14 @@ void ath9k_hw_apply_txpower(struct ath_h
        channel = chan->chan;
        chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
        new_pwr = min_t(int, chan_pwr, reg->power_limit);
@@ -28,8 +28,7 @@ This reverts commit 71f5137bf010c6faffab50c0ec15374c59c4a411.
 +      if (ant_gain > max_gain)
 +              ant_reduction = ant_gain - max_gain;
  
-       ah->eep_ops->set_txpower(ah, chan,
-                                ath9k_regd_get_ctl(reg, chan),
+       ah->eep_ops->set_txpower(ah, chan, ctl,
 -                               get_antenna_gain(ah, chan), new_pwr, test);
 +                               ant_reduction, new_pwr, test);
  }