Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8ab9d60f authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.12.r1-18500-SMxx50.QSSI14.0' of... 

Merge tag 'LA.UM.9.12.r1-18500-SMxx50.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn into android13-4.19-kona

LA.UM.9.12.r1-18500-SMxx50.QSSI14.0

* tag 'LA.UM.9.12.r1-18500-SMxx50.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn:
  qcacmn: Fix out of bound read issue in ESP ie parse
  qcacmn: Update no. of DWORDs for htt_tx_msdu_desc_ext2_t

 Conflicts:
	drivers/staging/qca-wifi-host-cmn/dp/wifi3.0/dp_tx.h

Change-Id: Ibf7ee1b0cd1a98e4f3f1b27e253d351cc6826714
parents 3773fe44 589808a7

drivers/staging/qca-wifi-host-cmn/dp/wifi3.0/dp_tx.h

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ do { \ 
#define DP_TX_QUEUE_MASK 0x3

#define DP_TX_MSDU_INFO_META_DATA_DWORDS 9





/**

 * struct dp_tx_frag_info_s

 * @vaddr: hlos vritual address for buffer