Commit 87e0a94e authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Steffen Klassert
Browse files

xfrm: rename xfrm_state_offload struct to allow reuse 



The struct xfrm_state_offload has all fields needed to hold information
for offloaded policies too. In order to do not create new struct with
same fields, let's rename existing one and reuse it later.

Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent a36708e6

include/net/xfrm.h

+5 −5
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ struct xfrm_state_walk { 
	struct xfrm_address_filter *filter;

};



struct xfrm_state_offload {

struct xfrm_dev_offload {

	struct net_device	*dev;

	netdevice_tracker	dev_tracker;

	struct net_device	*real_dev;
@@ -246,7 +246,7 @@ struct xfrm_state { 
	struct xfrm_lifetime_cur curlft;

	struct hrtimer		mtimer;



	struct xfrm_state_offload xso;

	struct xfrm_dev_offload xso;



	/* used to fix curlft->add_time when changing date */

	long		saved_tmo;
@@ -1865,7 +1865,7 @@ bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x); 


static inline void xfrm_dev_state_advance_esn(struct xfrm_state *x)

{

	struct xfrm_state_offload *xso = &x->xso;

	struct xfrm_dev_offload *xso = &x->xso;



	if (xso->dev && xso->dev->xfrmdev_ops->xdo_dev_state_advance_esn)

		xso->dev->xfrmdev_ops->xdo_dev_state_advance_esn(x);
@@ -1891,7 +1891,7 @@ static inline bool xfrm_dst_offload_ok(struct dst_entry *dst) 


static inline void xfrm_dev_state_delete(struct xfrm_state *x)

{

	struct xfrm_state_offload *xso = &x->xso;

	struct xfrm_dev_offload *xso = &x->xso;



	if (xso->dev)

		xso->dev->xfrmdev_ops->xdo_dev_state_delete(x);
@@ -1899,7 +1899,7 @@ static inline void xfrm_dev_state_delete(struct xfrm_state *x) 


static inline void xfrm_dev_state_free(struct xfrm_state *x)

{

	struct xfrm_state_offload *xso = &x->xso;

	struct xfrm_dev_offload *xso = &x->xso;

	struct net_device *dev = xso->dev;



	if (dev && dev->xfrmdev_ops) {

net/xfrm/xfrm_device.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, 
	int err;

	struct dst_entry *dst;

	struct net_device *dev;

	struct xfrm_state_offload *xso = &x->xso;

	struct xfrm_dev_offload *xso = &x->xso;

	xfrm_address_t *saddr;

	xfrm_address_t *daddr;

net/xfrm/xfrm_state.c

+2 −2
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ xfrm_dev_state_flush_secctx_check(struct net *net, struct net_device *dev, bool 


	for (i = 0; i <= net->xfrm.state_hmask; i++) {

		struct xfrm_state *x;

		struct xfrm_state_offload *xso;

		struct xfrm_dev_offload *xso;



		hlist_for_each_entry(x, net->xfrm.state_bydst+i, bydst) {

			xso = &x->xso;
@@ -835,7 +835,7 @@ int xfrm_dev_state_flush(struct net *net, struct net_device *dev, bool task_vali 
	err = -ESRCH;

	for (i = 0; i <= net->xfrm.state_hmask; i++) {

		struct xfrm_state *x;

		struct xfrm_state_offload *xso;

		struct xfrm_dev_offload *xso;

restart:

		hlist_for_each_entry(x, net->xfrm.state_bydst+i, bydst) {

			xso = &x->xso;

net/xfrm/xfrm_user.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static int copy_sec_ctx(struct xfrm_sec_ctx *s, struct sk_buff *skb) 
	return 0;

}



static int copy_user_offload(struct xfrm_state_offload *xso, struct sk_buff *skb)

static int copy_user_offload(struct xfrm_dev_offload *xso, struct sk_buff *skb)

{

	struct xfrm_user_offload *xuo;

	struct nlattr *attr;