5 files changed, 18 insertions, 17 deletions

diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index 04ceb6e13b9d..e1b8f4b90d80 100644
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
@@ -68,7 +68,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
 {
         int err;
         u32 spi, seq;
-        struct sec_decap_state xfrm_vec[XFRM_MAX_DEPTH];
+        struct xfrm_state *xfrm_vec[XFRM_MAX_DEPTH];
         struct xfrm_state *x;
         int xfrm_nr = 0;
         int decaps = 0;
@@ -99,7 +99,6 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
                 if (xfrm_state_check_expire(x))
                         goto drop_unlock;
 
-                xfrm_vec[xfrm_nr].decap.decap_type = encap_type;
                 if (x->type->input(x, skb))
                         goto drop_unlock;
 
@@ -114,7 +113,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
 
                 spin_unlock(&x->lock);
 
-                xfrm_vec[xfrm_nr++].xvec = x;
+                xfrm_vec[xfrm_nr++] = x;
 
                 iph = skb->nh.iph;
 
@@ -156,7 +155,8 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
         if (xfrm_nr + skb->sp->len > XFRM_MAX_DEPTH)
                 goto drop;
 
-        memcpy(skb->sp->x+skb->sp->len, xfrm_vec, xfrm_nr*sizeof(struct sec_decap_state));
+        memcpy(skb->sp->xvec + skb->sp->len, xfrm_vec,
+               xfrm_nr * sizeof(xfrm_vec[0]));
         skb->sp->len += xfrm_nr;
 
         nf_reset(skb);
@@ -187,7 +187,7 @@ drop_unlock:
         xfrm_state_put(x);
 drop:
         while (--xfrm_nr >= 0)
-                xfrm_state_put(xfrm_vec[xfrm_nr].xvec);
+                xfrm_state_put(xfrm_vec[xfrm_nr]);
 
         kfree_skb(skb);
         return 0;
diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index ec7a96e9fa64..00cfdee18dca 100644
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -32,7 +32,7 @@ int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi)
 {
         int err;
         u32 seq;
-        struct sec_decap_state xfrm_vec[XFRM_MAX_DEPTH];
+        struct xfrm_state *xfrm_vec[XFRM_MAX_DEPTH];
         struct xfrm_state *x;
         int xfrm_nr = 0;
         int decaps = 0;
@@ -79,7 +79,7 @@ int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi)
 
                 spin_unlock(&x->lock);
 
-                xfrm_vec[xfrm_nr++].xvec = x;
+                xfrm_vec[xfrm_nr++] = x;
 
                 if (x->props.mode) { /* XXX */
                         if (nexthdr != IPPROTO_IPV6)
@@ -118,7 +118,8 @@ int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi)
         if (xfrm_nr + skb->sp->len > XFRM_MAX_DEPTH)
                 goto drop;
 
-        memcpy(skb->sp->x+skb->sp->len, xfrm_vec, xfrm_nr*sizeof(struct sec_decap_state));
+        memcpy(skb->sp->xvec + skb->sp->len, xfrm_vec,
+               xfrm_nr * sizeof(xfrm_vec[0]));
         skb->sp->len += xfrm_nr;
         skb->ip_summed = CHECKSUM_NONE;
 
@@ -149,7 +150,7 @@ drop_unlock:
         xfrm_state_put(x);
 drop:
         while (--xfrm_nr >= 0)
-                xfrm_state_put(xfrm_vec[xfrm_nr].xvec);
+                xfrm_state_put(xfrm_vec[xfrm_nr]);
         kfree_skb(skb);
         return -1;
 }
diff --git a/net/netfilter/xt_policy.c b/net/netfilter/xt_policy.c
index 1099cb005fcc..a3aa62fbda6f 100644
--- a/net/netfilter/xt_policy.c
+++ b/net/netfilter/xt_policy.c
@@ -71,7 +71,7 @@ match_policy_in(const struct sk_buff *skb, const struct xt_policy_info *info,
                         return 0;
                 e = &info->pol[pos];
 
-                if (match_xfrm_state(sp->x[i].xvec, e, family)) {
+                if (match_xfrm_state(sp->xvec[i], e, family)) {
                         if (!strict)
                                 return 1;
                 } else if (strict)
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 2407a7072327..b54971059f16 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -18,7 +18,7 @@ void __secpath_destroy(struct sec_path *sp)
 {
         int i;
         for (i = 0; i < sp->len; i++)
-                xfrm_state_put(sp->x[i].xvec);
+                xfrm_state_put(sp->xvec[i]);
         kmem_cache_free(secpath_cachep, sp);
 }
 EXPORT_SYMBOL(__secpath_destroy);
@@ -37,7 +37,7 @@ struct sec_path *secpath_dup(struct sec_path *src)
 
                 memcpy(sp, src, sizeof(*sp));
                 for (i = 0; i < sp->len; i++)
-                        xfrm_state_hold(sp->x[i].xvec);
+                        xfrm_state_hold(sp->xvec[i]);
         }
         atomic_set(&sp->refcnt, 1);
         return sp;
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index f5eae9febd26..c3725fe2a8fb 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -943,9 +943,9 @@ xfrm_policy_ok(struct xfrm_tmpl *tmpl, struct sec_path *sp, int start,
         } else
                 start = -1;
         for (; idx < sp->len; idx++) {
-                if (xfrm_state_ok(tmpl, sp->x[idx].xvec, family))
+                if (xfrm_state_ok(tmpl, sp->xvec[idx], family))
                         return ++idx;
-                if (sp->x[idx].xvec->props.mode)
+                if (sp->xvec[idx]->props.mode)
                         break;
         }
         return start;
@@ -968,7 +968,7 @@ EXPORT_SYMBOL(xfrm_decode_session);
 static inline int secpath_has_tunnel(struct sec_path *sp, int k)
 {
         for (; k < sp->len; k++) {
-                if (sp->x[k].xvec->props.mode)
+                if (sp->xvec[k]->props.mode)
                         return 1;
         }
 
@@ -994,8 +994,8 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
                 int i;
 
                 for (i=skb->sp->len-1; i>=0; i--) {
-                        struct sec_decap_state *xvec = &(skb->sp->x[i]);
-                        if (!xfrm_selector_match(&xvec->xvec->sel, &fl, family))
+                        struct xfrm_state *x = skb->sp->xvec[i];
+                        if (!xfrm_selector_match(&x->sel, &fl, family))
                                 return 0;
                 }
         }