mac80211: refresh patches

Signed-off-by: Felix Fietkau <nbd@nbd.name>

3 files changed, 16 insertions, 16 deletions

diff --git a/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch b/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch
index 7b036e4e4c..ac78e62ccc 100644
--- a/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch
+++ b/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch
@@ -166,8 +166,7 @@
  #define AES_CCM_H
  
 -#include "aead_api.h"
-+#include <linux/crypto.h>
- 
+-
 -#define CCM_AAD_LEN	32
 -
 -static inline struct crypto_aead *
@@ -195,7 +194,8 @@
 -			    be16_to_cpup((__be16 *)aad),
 -			    data, data_len, mic);
 -}
--
++#include <linux/crypto.h>
+ 
 -static inline void ieee80211_aes_key_free(struct crypto_aead *tfm)
 -{
 -	return aead_key_free(tfm);
@@ -331,10 +331,10 @@
  #define AES_GCM_H
  
 -#include "aead_api.h"
+-
+-#define GCM_AAD_LEN	32
 +#include <linux/crypto.h>
  
--#define GCM_AAD_LEN	32
--
 -static inline int ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm,
 -					    u8 *j_0, u8 *aad,  u8 *data,
 -					    size_t data_len, u8 *mic)
diff --git a/package/kernel/mac80211/patches/subsys/341-mac80211-minstrel_ht-improve-ampdu-length-estimation.patch b/package/kernel/mac80211/patches/subsys/341-mac80211-minstrel_ht-improve-ampdu-length-estimation.patch
index a8e6e89954..f450ca9ca9 100644
--- a/package/kernel/mac80211/patches/subsys/341-mac80211-minstrel_ht-improve-ampdu-length-estimation.patch
+++ b/package/kernel/mac80211/patches/subsys/341-mac80211-minstrel_ht-improve-ampdu-length-estimation.patch
@@ -27,7 +27,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -	if (!mi->avg_ampdu_len)
 -		return AVG_AMPDU_SIZE;
 +	int duration;
-+
+ 
+-	return MINSTREL_TRUNC(mi->avg_ampdu_len);
 +	if (mi->avg_ampdu_len)
 +		return MINSTREL_TRUNC(mi->avg_ampdu_len);
 +
@@ -35,8 +36,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +		return 1;
 +
 +	duration = minstrel_get_duration(mi->max_tp_rate[0]);
- 
--	return MINSTREL_TRUNC(mi->avg_ampdu_len);
++
 +	if (duration > 400 * 1000)
 +		return 2;
 +
diff --git a/package/kernel/mac80211/patches/subsys/349-mac80211-minstrel_ht-significantly-redesign-the-rate.patch b/package/kernel/mac80211/patches/subsys/349-mac80211-minstrel_ht-significantly-redesign-the-rate.patch
index 09f6fd2214..7af13661a8 100644
--- a/package/kernel/mac80211/patches/subsys/349-mac80211-minstrel_ht-significantly-redesign-the-rate.patch
+++ b/package/kernel/mac80211/patches/subsys/349-mac80211-minstrel_ht-significantly-redesign-the-rate.patch
@@ -179,14 +179,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +	if (!rate)
  		return;
 -	}
--
+ 
 -	i = 0;
 -	if (n_rates > 1) {
 -		random = prandom_u32();
 -		i = random % n_rates;
 -	}
 -	probe_rate = rates[i];
- 
+-
 -out:
 -	mi->sample_rate = probe_rate;
 +	mi->sample_rate = rate;
@@ -584,13 +584,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -
 -	if (!(mi->supported[sample_group] & BIT(sample_idx)))
 -		return -1;
-+	u8 seq;
- 
+-
 -	mrs = &mg->rates[sample_idx];
 -	sample_idx += MI_RATE(sample_group, 0);
 -
 -	tp_rate1 = mi->max_tp_rate[0];
--
++	u8 seq;
+ 
 -	/* Set tp_rate2 to the second highest max_tp_rate */
 -	if (minstrel_get_duration(mi->max_tp_rate[0]) >
 -	    minstrel_get_duration(mi->max_tp_rate[1])) {
@@ -673,7 +673,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -	else
 -		sample_idx = minstrel_get_sample_rate(mp, mi);
 +		return;
-+
+ 
+-	if (sample_idx < 0)
 +	if (mp->hw->max_rates == 1 && mp->sample_switch &&
 +	    (mi->total_packets_cur >= SAMPLE_SWITCH_THR ||
 +	     mp->sample_switch == 1))
@@ -681,8 +682,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +
 +	if (time_is_before_jiffies(mi->sample_time))
 +		return;
- 
--	if (sample_idx < 0)
++
 +	mi->sample_time = jiffies + MINSTREL_SAMPLE_INTERVAL;
 +	sample_idx = minstrel_ht_get_sample_rate(mp, mi);
 +	if (!sample_idx)