Update lar patch for kernel 6.7

3 files changed, 13 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2947d6bf4271..d0922a0ccfca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = iwlwifi-lar-disable-dkms
 	pkgdesc = Intel wireless chips driver from linux (6.7.1) with patch for lar_disable parameter 5GHz band support
 	pkgver = 6.7.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
 	arch = any
 	license = GPL2
@@ -12,6 +12,6 @@ pkgbase = iwlwifi-lar-disable-dkms
 	source = c545b26dd567a638d62ca29490e9e2e6d04a8b6b.patch
 	md5sums = d8a7394e0e349dd373e9722e141c8b61
 	md5sums = 730652a6fd46eaa97c001c01ea14dc91
-	md5sums = 14e0796137ec0d88812239727a9bdb25
+	md5sums = 29336370f1863ad94c15dc3fbef9b63c
 
 pkgname = iwlwifi-lar-disable-dkms
diff --git a/PKGBUILD b/PKGBUILD
index 612d71129aa8..f7e4f85afd57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _srcname=iwlwifi-lar-disable
 pkgname=${_srcname}-dkms
 pkgver=6.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Intel wireless chips driver from linux ($pkgver) with patch for lar_disable parameter 5GHz band support"
 arch=('any')
 url="https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi"
@@ -14,7 +14,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-${pkgver
 	"c545b26dd567a638d62ca29490e9e2e6d04a8b6b.patch")
 md5sums=('d8a7394e0e349dd373e9722e141c8b61'
          '730652a6fd46eaa97c001c01ea14dc91'
-         '14e0796137ec0d88812239727a9bdb25')
+         '29336370f1863ad94c15dc3fbef9b63c')
 
 options=(!strip)
 
diff --git a/c545b26dd567a638d62ca29490e9e2e6d04a8b6b.patch b/c545b26dd567a638d62ca29490e9e2e6d04a8b6b.patch
index 56ed607c5c74..434d9d32b057 100644
--- a/c545b26dd567a638d62ca29490e9e2e6d04a8b6b.patch
+++ b/c545b26dd567a638d62ca29490e9e2e6d04a8b6b.patch
@@ -97,7 +97,7 @@ index e01f7751cf1130..001648c46fdd37 100644
 @@ -22,7 +22,7 @@ enum iwl_nvm_sbands_flags {
  };
  
- /**
+ /*
 - * iwl_parse_nvm_data - parse NVM data and return values
 + * const struct iwl_fw *fw,iwl_parse_nvm_data - parse NVM data and return values
   *
@@ -130,17 +130,17 @@ diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless
 index 6d18a1fd649b90..0a93b820299864 100644
 --- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
 +++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
-@@ -220,6 +220,7 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
- 	struct iwl_nvm_section *sections = mvm->nvm_sections;
- 	const __be16 *hw;
+@@ -222,6 +222,7 @@
  	const __le16 *sw, *calib, *regulatory, *mac_override, *phy_sku;
+	u8 tx_ant = mvm->fw->valid_tx_ant;
+	u8 rx_ant = mvm->fw->valid_rx_ant;
 +	bool lar_enabled;
  	int regulatory_type;
  
  	/* Checking for required sections */
-@@ -270,9 +271,14 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
- 		(const __le16 *)sections[NVM_SECTION_TYPE_REGULATORY_SDP].data :
- 		(const __le16 *)sections[NVM_SECTION_TYPE_REGULATORY].data;
+@@ -278,9 +279,14 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
+	if (mvm->set_rx_ant)
+		rx_ant &= mvm->set_rx_ant;
  
 +	lar_enabled = !iwlwifi_mod_params.lar_disable &&
 +		fw_has_capa(&mvm->fw->ucode_capa,
@@ -148,8 +148,8 @@ index 6d18a1fd649b90..0a93b820299864 100644
 +
  	return iwl_parse_nvm_data(mvm->trans, mvm->cfg, mvm->fw, hw, sw, calib,
  				  regulatory, mac_override, phy_sku,
--				  mvm->fw->valid_tx_ant, mvm->fw->valid_rx_ant);
-+				  mvm->fw->valid_tx_ant, mvm->fw->valid_rx_ant,
+-				  tx_ant, rx_ant);
++				  tx_ant, rx_ant,
 +				  lar_enabled);
  }