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 60075b0cbeeff891c1959a54e8e17cd152ee2e4c
Author: Konstantin Khorenko <khore...@virtuozzo.com>
Date: Mon Sep 20 18:06:59 2021 +0300
Revert "ms/net: macsec: add support for offloading to the MAC"
This reverts commit 21114b7feec29e4425a3ac48a037569c016a46c8.
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>
---
drivers/net/macsec.c | 13 ++-----------
include/uapi/linux/if_link.h | 1 -
tools/include/uapi/linux/if_link.h | 1 -
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 6c0e5a0d32c7..0fa8d8e53217 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -329,8 +329,7 @@ static void macsec_set_shortlen(struct macsec_eth_header
*h, size_t data_len)
/* Checks if a MACsec interface is being offloaded to an hardware engine */
static bool macsec_is_offloaded(struct macsec_dev *macsec)
{
- if (macsec->offload == MACSEC_OFFLOAD_MAC ||
- macsec->offload == MACSEC_OFFLOAD_PHY)
+ if (macsec->offload == MACSEC_OFFLOAD_PHY)
return true;
return false;
@@ -346,9 +345,6 @@ static bool macsec_check_offload(enum macsec_offload
offload,
if (offload == MACSEC_OFFLOAD_PHY)
return macsec->real_dev->phydev &&
macsec->real_dev->phydev->macsec_ops;
- else if (offload == MACSEC_OFFLOAD_MAC)
- return macsec->real_dev->features & NETIF_F_HW_MACSEC &&
- macsec->real_dev->macsec_ops;
return false;
}
@@ -363,14 +359,9 @@ static const struct macsec_ops *__macsec_get_ops(enum
macsec_offload offload,
if (offload == MACSEC_OFFLOAD_PHY)
ctx->phydev = macsec->real_dev->phydev;
- else if (offload == MACSEC_OFFLOAD_MAC)
- ctx->netdev = macsec->real_dev;
}
- if (offload == MACSEC_OFFLOAD_PHY)
- return macsec->real_dev->phydev->macsec_ops;
- else
- return macsec->real_dev->macsec_ops;
+ return macsec->real_dev->phydev->macsec_ops;
}
/* Returns a pointer to the MACsec ops struct if any and updates the MACsec
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 4882e81514b6..61371a0a867b 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -684,7 +684,6 @@ enum macsec_validation_type {
enum macsec_offload {
MACSEC_OFFLOAD_OFF = 0,
MACSEC_OFFLOAD_PHY = 1,
- MACSEC_OFFLOAD_MAC = 2,
__MACSEC_OFFLOAD_END,
MACSEC_OFFLOAD_MAX = __MACSEC_OFFLOAD_END - 1,
};
diff --git a/tools/include/uapi/linux/if_link.h
b/tools/include/uapi/linux/if_link.h
index d208b2af697f..00e6fe5277b6 100644
--- a/tools/include/uapi/linux/if_link.h
+++ b/tools/include/uapi/linux/if_link.h
@@ -494,7 +494,6 @@ enum macsec_validation_type {
enum macsec_offload {
MACSEC_OFFLOAD_OFF = 0,
MACSEC_OFFLOAD_PHY = 1,
- MACSEC_OFFLOAD_MAC = 2,
__MACSEC_OFFLOAD_END,
MACSEC_OFFLOAD_MAX = __MACSEC_OFFLOAD_END - 1,
};
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
