[IPSEC]: Only set neighbour on top xfrm dst

[linux-2.6-omap-h63xx.git] / net / ipv6 / xfrm6_policy.c

diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index b8e9eb445d744e63e9430fa5ede84810236fcccc..bc508d0a87d580736879e39cae680cb5eaca4143 100644 (file)
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -102,24 +102,6 @@ __xfrm6_bundle_addr_local(struct xfrm_state *x, struct in6_addr *addr)
                (struct in6_addr*)&x->props.saddr;
 }
 
-static inline void
-__xfrm6_bundle_len_inc(int *len, int *nflen, struct xfrm_state *x)
-{
-       if (x->type->flags & XFRM_TYPE_NON_FRAGMENT)
-               *nflen += x->props.header_len;
-       else
-               *len += x->props.header_len;
-}
-
-static inline void
-__xfrm6_bundle_len_dec(int *len, int *nflen, struct xfrm_state *x)
-{
-       if (x->type->flags & XFRM_TYPE_NON_FRAGMENT)
-               *nflen -= x->props.header_len;
-       else
-               *len -= x->props.header_len;
-}
-
 /* Allocate chain of dst_entry's, attach known xfrm's, calculate
  * all the metrics... Shortly, bundle a bundle.
  */
@@ -142,7 +124,6 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
        int i;
        int err = 0;
        int header_len = 0;
-       int nfheader_len = 0;
        int trailer_len = 0;
 
        dst = dst_prev = NULL;
@@ -175,7 +156,10 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
                dst1->next = dst_prev;
                dst_prev = dst1;
 
-               __xfrm6_bundle_len_inc(&header_len, &nfheader_len, xfrm[i]);
+               if (xfrm[i]->type->flags & XFRM_TYPE_NON_FRAGMENT)
+                       ((struct rt6_info *)dst)->nfheader_len +=
+                               xfrm[i]->props.header_len;
+               header_len += xfrm[i]->props.header_len;
                trailer_len += xfrm[i]->props.trailer_len;
 
                if (xfrm[i]->props.mode != XFRM_MODE_TRANSPORT) {
@@ -204,6 +188,10 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
 
        dst_prev->child = &rt->u.dst;
        dst->path = &rt->u.dst;
+
+       /* Copy neighbour for reachability confirmation */
+       dst->neighbour = neigh_clone(rt->u.dst.neighbour);
+
        if (rt->rt6i_node)
                ((struct xfrm_dst *)dst)->path_cookie = rt->rt6i_node->fn_sernum;
 
@@ -223,12 +211,9 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
                dst_prev->flags        |= DST_HOST;
                dst_prev->lastuse       = jiffies;
                dst_prev->header_len    = header_len;
-               dst_prev->nfheader_len  = nfheader_len;
                dst_prev->trailer_len   = trailer_len;
                memcpy(&dst_prev->metrics, &x->route->metrics, sizeof(dst_prev->metrics));
 
-               /* Copy neighbour for reachability confirmation */
-               dst_prev->neighbour     = neigh_clone(rt->u.dst.neighbour);
                dst_prev->input         = rt->u.dst.input;
                dst_prev->output = dst_prev->xfrm->outer_mode->afinfo->output;
                /* Sheit... I remember I did this right. Apparently,
@@ -242,7 +227,7 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
                x->u.rt6.rt6i_src      = rt0->rt6i_src;
                x->u.rt6.rt6i_idev     = rt0->rt6i_idev;
                in6_dev_hold(rt0->rt6i_idev);
-               __xfrm6_bundle_len_dec(&header_len, &nfheader_len, x->u.dst.xfrm);
+               header_len -= x->u.dst.xfrm->props.header_len;
                trailer_len -= x->u.dst.xfrm->props.trailer_len;
        }