Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbac7e54 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: introduce the MACSEC netdev feature"

parents c2e80749 b96af0f3

include/linux/netdev_features.h

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ 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 */



	/*

	 * Add your fresh new feature above and remember to update

	 * netdev_features_strings[] in net/ethtool/common.c and maybe
@@ -154,6 +156,7 @@ 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)



/* Finds the next feature with the highest number of the range of start till 0.

 */

net/core/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] 
	[NETIF_F_HW_TLS_RECORD_BIT] =	"tls-hw-record",

	[NETIF_F_HW_TLS_TX_BIT] =	 "tls-hw-tx-offload",

	[NETIF_F_HW_TLS_RX_BIT] =	 "tls-hw-rx-offload",

	[NETIF_F_HW_MACSEC_BIT] =        "macsec-hw-offload",

};



static const char