Commit:     7aa68cb90638ccc36559a936814e4c089892b3d9
Parent:     33b5ecb8f64706d1ed472dcb44162ab3a7345724
Author:     Herbert Xu <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 17 21:30:07 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 21:30:07 2007 -0700

    [IPSEC]: Move ip_summed zapping out of xfrm6_rcv_spi
    Not every transform needs to zap ip_summed.  For example, a pure tunnel
    mode encapsulation does not affect the hardware checksum at all.  In fact,
    every algorithm (that needs this) other than AH6 already does its own
    ip_summed zapping.
    This patch moves the zapping into AH6 which is in line with what IPv4 does.
    Possible future optimisation: Checksum the data as we copy them in IPComp.
    Signed-off-by: Herbert Xu <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/ipv6/ah6.c         |    2 ++
 net/ipv6/xfrm6_input.c |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index f9f6891..a8221d1 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -344,6 +344,8 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff 
            pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
                goto out;
+       skb->ip_summed = CHECKSUM_NONE;
        hdr_len = skb->data - skb_network_header(skb);
        ah = (struct ip_auth_hdr *)skb->data;
        ahp = x->data;
diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index 596a730..b1201c3 100644
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -97,7 +97,6 @@ int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 
        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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to