Commit 76564261 authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller
Browse files

net: macsec: introduce the macsec_context structure 



This patch introduces the macsec_context structure. It will be used
in the kernel to exchange information between the common MACsec
implementation (macsec.c) and the MACsec hardware offloading
implementations. This structure contains pointers to MACsec specific
structures which contain the actual MACsec configuration, and to the
underlying device (phydev for now).

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0e4eadf

include/linux/phy.h

+2 −0
Original line number Diff line number Diff line
@@ -332,6 +332,8 @@ struct phy_c45_device_ids { 
	u32 device_ids[8];

};



struct macsec_context;



/* phy_device: An instance of a PHY

 *

 * drv: Pointer to the driver for this PHY instance

include/net/macsec.h

+21 −0
Original line number Diff line number Diff line
@@ -174,4 +174,25 @@ struct macsec_secy { 
	struct macsec_rx_sc __rcu *rx_sc;

};



/**

 * struct macsec_context - MACsec context for hardware offloading

 */

struct macsec_context {

	struct phy_device *phydev;

	enum macsec_offload offload;



	struct macsec_secy *secy;

	struct macsec_rx_sc *rx_sc;

	struct {

		unsigned char assoc_num;

		u8 key[MACSEC_KEYID_LEN];

		union {

			struct macsec_rx_sa *rx_sa;

			struct macsec_tx_sa *tx_sa;

		};

	} sa;



	u8 prepare:1;

};



#endif /* _NET_MACSEC_H_ */

include/uapi/linux/if_link.h

+7 −0
Original line number Diff line number Diff line
@@ -486,6 +486,13 @@ enum macsec_validation_type { 
	MACSEC_VALIDATE_MAX = __MACSEC_VALIDATE_END - 1,

};



enum macsec_offload {

	MACSEC_OFFLOAD_OFF = 0,

	MACSEC_OFFLOAD_PHY = 1,

	__MACSEC_OFFLOAD_END,

	MACSEC_OFFLOAD_MAX = __MACSEC_OFFLOAD_END - 1,

};



/* IPVLAN section */

enum {

	IFLA_IPVLAN_UNSPEC,

tools/include/uapi/linux/if_link.h

+7 −0
Original line number Diff line number Diff line
@@ -485,6 +485,13 @@ enum macsec_validation_type { 
	MACSEC_VALIDATE_MAX = __MACSEC_VALIDATE_END - 1,

};



enum macsec_offload {

	MACSEC_OFFLOAD_OFF = 0,

	MACSEC_OFFLOAD_PHY = 1,

	__MACSEC_OFFLOAD_END,

	MACSEC_OFFLOAD_MAX = __MACSEC_OFFLOAD_END - 1,

};



/* IPVLAN section */

enum {

	IFLA_IPVLAN_UNSPEC,

CRA Git | Maintained and supported by SUSTech CRA and CCSE