[SRU Kinetic 2/2] UBUNTU: [Config]: Make sure CONFIG_NET_CLS_TCINDEX is not available

[Thadeu Lima de Souza Cascardo]

CVE-2023-1829
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
---
 debian.master/abi/amd64/generic.modules      | 1 -
 debian.master/abi/arm64/generic-64k.modules  | 1 -
 debian.master/abi/arm64/generic.modules      | 1 -
 debian.master/abi/armhf/generic-lpae.modules | 1 -
 debian.master/abi/armhf/generic.modules      | 1 -
 debian.master/abi/ppc64el/generic.modules    | 1 -
 debian.master/abi/s390x/generic.modules      | 1 -
 debian.master/config/annotations             | 2 +-
 debian.master/config/config.common.ubuntu    | 1 -
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/debian.master/abi/amd64/generic.modules b/debian.master/abi/amd64/generic.modules
index 2023aeedaedb..492697e3d804 100644
--- a/debian.master/abi/amd64/generic.modules
+++ b/debian.master/abi/amd64/generic.modules
@@ -835,7 +835,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/arm64/generic-64k.modules b/debian.master/abi/arm64/generic-64k.modules
index 40eb1d4780cb..064c6a96cafd 100644
--- a/debian.master/abi/arm64/generic-64k.modules
+++ b/debian.master/abi/arm64/generic-64k.modules
@@ -917,7 +917,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/arm64/generic.modules b/debian.master/abi/arm64/generic.modules
index 580550009c43..275d891a2cdd 100644
--- a/debian.master/abi/arm64/generic.modules
+++ b/debian.master/abi/arm64/generic.modules
@@ -917,7 +917,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/armhf/generic-lpae.modules b/debian.master/abi/armhf/generic-lpae.modules
index d5bd8763aca1..553cdcf82e9e 100644
--- a/debian.master/abi/armhf/generic-lpae.modules
+++ b/debian.master/abi/armhf/generic-lpae.modules
@@ -861,7 +861,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/armhf/generic.modules b/debian.master/abi/armhf/generic.modules
index 31a05b05f0e6..cfeef58f1797 100644
--- a/debian.master/abi/armhf/generic.modules
+++ b/debian.master/abi/armhf/generic.modules
@@ -861,7 +861,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/ppc64el/generic.modules b/debian.master/abi/ppc64el/generic.modules
index e8361d1185af..79a43556f4fb 100644
--- a/debian.master/abi/ppc64el/generic.modules
+++ b/debian.master/abi/ppc64el/generic.modules
@@ -784,7 +784,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/s390x/generic.modules b/debian.master/abi/s390x/generic.modules
index f640275efd93..f506ef41d9ae 100644
--- a/debian.master/abi/s390x/generic.modules
+++ b/debian.master/abi/s390x/generic.modules
@@ -113,7 +113,6 @@ cls_matchall
 cls_route
 cls_rsvp
 cls_rsvp6
-cls_tcindex
 cls_u32
 cmac
 coda
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index c0d51a759b94..3ef73b5ba929 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -12790,7 +12790,7 @@ CONFIG_NET_SCH_INGRESS                          policy<{'amd64': 'm', 'arm64': '
 CONFIG_NET_SCH_PLUG                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_SCH_ETS                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_BASIC                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
-CONFIG_NET_CLS_TCINDEX                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
+CONFIG_NET_CLS_TCINDEX                          policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'ppc64el': '-', 'riscv64': '-', 's390x': '-'}>
 CONFIG_NET_CLS_ROUTE4                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_FW                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_U32                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1284d6c7eba8..7ff5b2f093c9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7127,7 +7127,6 @@ CONFIG_NET_CLS_MATCHALL=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_U32=m
 CONFIG_NET_CORE=y
 CONFIG_NET_DEVLINK=y
-- 
2.34.1