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

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

Merge "net: macsec: allow to reference a netdev from a MACsec context"

parents dbac7e54 21d6b608

include/linux/netdevice.h

+9 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ struct netpoll_info; 
struct device;

struct phy_device;

struct dsa_port;

struct macsec_context;

struct macsec_ops;



struct sfp_bus;

/* 802.11 specific */
@@ -1809,6 +1811,8 @@ enum netdev_priv_flags { 
 *

 *	@wol_enabled:	Wake-on-LAN is enabled

 *

 *	@macsec_ops:    MACsec offloading ops

 *

 *	FIXME: cleanup struct net_device such that network protocol info

 *	moves out.

 */
@@ -2100,6 +2104,11 @@ struct net_device { 
	bool			proto_down;

	unsigned		wol_enabled:1;



#if IS_ENABLED(CONFIG_MACSEC)

	/* MACsec management functions */

	const struct macsec_ops *macsec_ops;

#endif



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

	ANDROID_KABI_RESERVE(3);

include/net/macsec.h

+4 −1
Original line number Diff line number Diff line
@@ -231,7 +231,10 @@ struct macsec_secy { 
 * struct macsec_context - MACsec context for hardware offloading

 */

struct macsec_context {

	union {

		struct net_device *netdev;

		struct phy_device *phydev;

	};

	enum macsec_offload offload;



	struct macsec_secy *secy;