Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / net / ipv6 / ip6_checksum.c

diff --git a/net/ipv6/ip6_checksum.c b/net/ipv6/ip6_checksum.c
index 9a4d732..b2025bf 100644 (file)
--- a/net/ipv6/ip6_checksum.c
+++ b/net/ipv6/ip6_checksum.c
@@ -6,8 +6,7 @@
 #ifndef _HAVE_ARCH_IPV6_CSUM
 __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                        const struct in6_addr *daddr,
-                       __u32 len, unsigned short proto,
-                       __wsum csum)
+                       __u32 len, __u8 proto, __wsum csum)
 {
 
        int carry;
@@ -98,27 +97,16 @@ void udp6_set_csum(bool nocheck, struct sk_buff *skb,
                uh->check = 0;
        else if (skb_is_gso(skb))
                uh->check = ~udp_v6_check(len, saddr, daddr, 0);
-       else if (skb_dst(skb) && skb_dst(skb)->dev &&
-                (skb_dst(skb)->dev->features & NETIF_F_IPV6_CSUM)) {
-
-               BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL);
-
+       else if (skb->ip_summed == CHECKSUM_PARTIAL) {
+               uh->check = 0;
+               uh->check = udp_v6_check(len, saddr, daddr, lco_csum(skb));
+               if (uh->check == 0)
+                       uh->check = CSUM_MANGLED_0;
+       } else {
                skb->ip_summed = CHECKSUM_PARTIAL;
                skb->csum_start = skb_transport_header(skb) - skb->head;
                skb->csum_offset = offsetof(struct udphdr, check);
                uh->check = ~udp_v6_check(len, saddr, daddr, 0);
-       } else {
-               __wsum csum;
-
-               BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL);
-
-               uh->check = 0;
-               csum = skb_checksum(skb, 0, len, 0);
-               uh->check = udp_v6_check(len, saddr, daddr, csum);
-               if (uh->check == 0)
-                       uh->check = CSUM_MANGLED_0;
-
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
        }
 }
 EXPORT_SYMBOL(udp6_set_csum);