diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-11-19 09:04:51 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-11-19 09:04:51 -0800 |
| commit | 7f1d99472e5dd083d95ac10a815bca16216b1d2c (patch) | |
| tree | 3a31c06f9a0a9c5037725d5a329518c667cf1914 /0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch | |
| parent | Updated to 5.12.2 (diff) | |
| download | linux-7f1d99472e5dd083d95ac10a815bca16216b1d2c.tar.xz | |
Updated to 5.15.3
Diffstat (limited to '0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch')
| -rw-r--r-- | 0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch b/0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch new file mode 100644 index 0000000..8cd4c11 --- /dev/null +++ b/0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch @@ -0,0 +1,47 @@ +From 150424b14ca70f807b083aaae52db9eb072ba2e4 Mon Sep 17 00:00:00 2001 +From: Larry Finger <Larry.Finger@lwfinger.net> +Date: Sun, 7 Nov 2021 11:35:43 -0600 +Subject: [PATCH 2/8] staging: r8188eu: Fix breakage introduced when 5G code + was removed + +In commit 221abd4d478a ("staging: r8188eu: Remove no more necessary definitions +and code"), two entries were removed from RTW_ChannelPlanMap[], but not replaced +with zeros. The position within this table is important, thus the patch broke +systems operating in regulatory domains osted later than entry 0x13 in the table. +Unfortunately, the FCC entry comes before that point and most testers did not see +this problem. + +Reported-and-tested-by: Zameer Manji <zmanji@gmail.com> +Reported-by: kernel test robot <lkp@intel.com> +Fixes: 221abd4d478a ("staging: r8188eu: Remove no more necessary definitions and code") +Cc: Stable <stable@vger.kernel.org> # v5.5+ +Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> +For: https://bugs.archlinux.org/task/72659 +For: https://bugs.archlinux.org/task/72760 +--- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c +index 5a472a4954b0..e5c907ac10fc 100644 +--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c ++++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c +@@ -104,6 +104,7 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = { + {0x01}, /* 0x10, RT_CHANNEL_DOMAIN_JAPAN */ + {0x02}, /* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */ + {0x01}, /* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */ ++ {0x00}, /* 0x13 */ + {0x02}, /* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */ + {0x00}, /* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */ + {0x00}, /* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */ +@@ -115,6 +116,7 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = { + {0x00}, /* 0x1C, */ + {0x00}, /* 0x1D, */ + {0x00}, /* 0x1E, */ ++ {0x00}, /* 0x1F, */ + /* 0x20 ~ 0x7F , New Define ===== */ + {0x00}, /* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */ + {0x01}, /* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */ +-- +2.33.1 + |