Apply previous fix to rockchip64-edge and rk322x

This commit is contained in:
John Williams
2023-07-06 19:59:55 +01:00
committed by Paolo
parent 38c3d109a6
commit 9ed43bdce8
3 changed files with 9 additions and 9 deletions

View File

@@ -46840,12 +46840,12 @@ index 000000000000..9c3574285364
+ rc_rate = &ssv_rc->rc_table[hw_rate_idx];
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
+ if (rc_rate->rc_flags & RC_FLAG_HT) {
+ rxs->flag |= RC_FLAG_HT;
+ // rxs->flag |= RC_FLAG_HT;
+ if (rc_rate->rc_flags & RC_FLAG_HT_SGI)
+ rxs->flag |= RX_ENC_FLAG_SHORT_GI;
+ rxs->enc_flags |= RX_ENC_FLAG_SHORT_GI;
+ } else {
+ if (rc_rate->rc_flags & RC_FLAG_SHORT_PREAMBLE)
+ rxs->flag |= RX_ENC_FLAG_SHORTPRE;
+ rxs->enc_flags |= RX_ENC_FLAG_SHORTPRE;
+ }
+#else
+ if (rc_rate->rc_flags & RC_FLAG_HT) {

View File

@@ -46841,12 +46841,12 @@ index 000000000000..9c3574285364
+ rc_rate = &ssv_rc->rc_table[hw_rate_idx];
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
+ if (rc_rate->rc_flags & RC_FLAG_HT) {
+ rxs->flag |= RC_FLAG_HT;
+ // rxs->flag |= RC_FLAG_HT;
+ if (rc_rate->rc_flags & RC_FLAG_HT_SGI)
+ rxs->flag |= RX_ENC_FLAG_SHORT_GI;
+ rxs->enc_flags |= RX_ENC_FLAG_SHORT_GI;
+ } else {
+ if (rc_rate->rc_flags & RC_FLAG_SHORT_PREAMBLE)
+ rxs->flag |= RX_ENC_FLAG_SHORTPRE;
+ rxs->enc_flags |= RX_ENC_FLAG_SHORTPRE;
+ }
+#else
+ if (rc_rate->rc_flags & RC_FLAG_HT) {

View File

@@ -46782,12 +46782,12 @@ index 000000000000..9c3574285364
+ rc_rate = &ssv_rc->rc_table[hw_rate_idx];
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
+ if (rc_rate->rc_flags & RC_FLAG_HT) {
+ rxs->flag |= RC_FLAG_HT;
+ // rxs->flag |= RC_FLAG_HT;
+ if (rc_rate->rc_flags & RC_FLAG_HT_SGI)
+ rxs->flag |= RX_ENC_FLAG_SHORT_GI;
+ rxs->enc_flags |= RX_ENC_FLAG_SHORT_GI;
+ } else {
+ if (rc_rate->rc_flags & RC_FLAG_SHORT_PREAMBLE)
+ rxs->flag |= RX_ENC_FLAG_SHORTPRE;
+ rxs->enc_flags |= RX_ENC_FLAG_SHORTPRE;
+ }
+#else
+ if (rc_rate->rc_flags & RC_FLAG_HT) {