xfrm: rename xfrm_state_offload struct to allow reuse

[ Upstream commit 87e0a94e60ea2e29be9dec6bc146fbc9861a4055 ]

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: Raed Salem <raeds@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Stable-dep-of: 2cf567f421db ("netdevsim: copy addresses for both in and out paths")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 20ce2e1b3f61ec20b5eeabb7b167658bb0fc6aff..395d85eeb5d880cb77e6d22aa9100b9fc36658c1 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -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;
        struct net_device       *real_dev;
        unsigned long           offload_handle;
@@ -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;
@@ -1885,7 +1885,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);
@@ -1911,7 +1911,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);
@@ -1919,7 +1919,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) {

diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c
index 4d13f7a372ab64bee511491ea169fcca65041619..61aa0fd9d2a0c1a8b61f986a065a159bb7923318 100644 (file)
--- a/net/xfrm/xfrm_device.c
+++ b/net/xfrm/xfrm_device.c
@@ -225,7 +225,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;
 

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 60f3ea5561ddf1bf05565e6ccbd6183be78a9f7b..ff8159bae7bbfc6cf4396ceb98fd5bc6d71cf575 100644 (file)
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -750,7 +750,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;
@@ -834,7 +834,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;

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 1ebd54afe34c9016afad7fbb760a1d0349a1e614..bb63b0dab87bdd7990d4ee645aa1b8c255e48499 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -843,7 +843,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;