The commit is pushed to "branch-rh9-5.14.vz9.1.x-ovz" and will appear at
https://src.openvz.org/scm/ovz/vzkernel.git
after ark-5.14
------>
commit aab95c2ee97aafdb77880eab9515c47b16331d66
Author: Konstantin Khorenko <khore...@virtuozzo.com>
Date: Mon Sep 20 17:53:55 2021 +0300
Revert "ms/net: introduce the MACSEC netdev feature"
This reverts commit 5908220b2b3d6918f88cd645a39e1dcb84d1c5d9.
Temporarily revert the patch in order to reuse netdev feature bit for
venet.
https://jira.sw.ru/browse/PSBM-133985
Will be re-applied after we drop venet in the scope of
https://jira.sw.ru/browse/PSBM-134132
Signed-off-by: Konstantin Khorenko <khore...@virtuozzo.com>
---
include/linux/netdev_features.h | 2 --
net/ethtool/common.c | 1 -
2 files changed, 3 deletions(-)
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index e7793410413b..1d15a4688b71 100644
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -83,7 +83,6 @@ enum {
NETIF_F_HW_TLS_RECORD_BIT, /* Offload TLS record */
NETIF_F_GRO_FRAGLIST_BIT, /* Fraglist GRO */
- NETIF_F_HW_MACSEC_BIT, /* Offload MACsec operations */
NETIF_F_GRO_UDP_FWD_BIT, /* Allow UDP GRO for forwarding */
NETIF_F_HW_HSR_TAG_INS_BIT, /* Offload HSR tag insertion */
@@ -162,7 +161,6 @@ enum {
#define NETIF_F_HW_TLS_RX __NETIF_F(HW_TLS_RX)
#define NETIF_F_GRO_FRAGLIST __NETIF_F(GRO_FRAGLIST)
#define NETIF_F_GSO_FRAGLIST __NETIF_F(GSO_FRAGLIST)
-#define NETIF_F_HW_MACSEC __NETIF_F(HW_MACSEC)
#define NETIF_F_GRO_UDP_FWD __NETIF_F(GRO_UDP_FWD)
#define NETIF_F_HW_HSR_TAG_INS __NETIF_F(HW_HSR_TAG_INS)
#define NETIF_F_HW_HSR_TAG_RM __NETIF_F(HW_HSR_TAG_RM)
diff --git a/net/ethtool/common.c b/net/ethtool/common.c
index c63e0739dc6a..7e850096bcec 100644
--- a/net/ethtool/common.c
+++ b/net/ethtool/common.c
@@ -68,7 +68,6 @@ const char
netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] = {
[NETIF_F_HW_TLS_TX_BIT] = "tls-hw-tx-offload",
[NETIF_F_HW_TLS_RX_BIT] = "tls-hw-rx-offload",
[NETIF_F_GRO_FRAGLIST_BIT] = "rx-gro-list",
- [NETIF_F_HW_MACSEC_BIT] = "macsec-hw-offload",
[NETIF_F_GRO_UDP_FWD_BIT] = "rx-udp-gro-forwarding",
[NETIF_F_HW_HSR_TAG_INS_BIT] = "hsr-tag-ins-offload",
[NETIF_F_HW_HSR_TAG_RM_BIT] = "hsr-tag-rm-offload",
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
