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

Commit da68b4ad authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net/tls: move definition of tls ops into net/tls.h 



There seems to be no reason for tls_ops to be defined in netdevice.h
which is included in a lot of places.  Don't wrap the struct/enum
declaration in ifdefs, it trickles down unnecessary ifdefs into
driver code.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e995797

include/linux/netdevice.h

+1 −22
Original line number Diff line number Diff line
@@ -914,34 +914,13 @@ struct xfrmdev_ops { 
};

#endif



#if IS_ENABLED(CONFIG_TLS_DEVICE)

enum tls_offload_ctx_dir {

	TLS_OFFLOAD_CTX_DIR_RX,

	TLS_OFFLOAD_CTX_DIR_TX,

};



struct tls_crypto_info;

struct tls_context;



struct tlsdev_ops {

	int (*tls_dev_add)(struct net_device *netdev, struct sock *sk,

			   enum tls_offload_ctx_dir direction,

			   struct tls_crypto_info *crypto_info,

			   u32 start_offload_tcp_sn);

	void (*tls_dev_del)(struct net_device *netdev,

			    struct tls_context *ctx,

			    enum tls_offload_ctx_dir direction);

	void (*tls_dev_resync_rx)(struct net_device *netdev,

				  struct sock *sk, u32 seq, u64 rcd_sn);

};

#endif



struct dev_ifalias {

	struct rcu_head rcuhead;

	char ifalias[];

};



struct devlink;

struct tlsdev_ops;



/*

 * This structure defines the management hooks for network devices.

include/net/tls.h

+17 −0
Original line number Diff line number Diff line
@@ -277,6 +277,23 @@ struct tls_context { 
	void (*unhash)(struct sock *sk);

};



enum tls_offload_ctx_dir {

	TLS_OFFLOAD_CTX_DIR_RX,

	TLS_OFFLOAD_CTX_DIR_TX,

};



struct tlsdev_ops {

	int (*tls_dev_add)(struct net_device *netdev, struct sock *sk,

			   enum tls_offload_ctx_dir direction,

			   struct tls_crypto_info *crypto_info,

			   u32 start_offload_tcp_sn);

	void (*tls_dev_del)(struct net_device *netdev,

			    struct tls_context *ctx,

			    enum tls_offload_ctx_dir direction);

	void (*tls_dev_resync_rx)(struct net_device *netdev,

				  struct sock *sk, u32 seq, u64 rcd_sn);

};



struct tls_offload_context_rx {

	/* sw must be the first member of tls_offload_context_rx */

	struct tls_sw_context_rx sw;