summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_gre.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-15 06:36:54 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 06:23:34 +0100
commit5f92a7388a29594d6c365b23a48d4bb8299a3ea7 (patch)
tree569e888e3b87dd77fa3eafa36dac96f2e1da00c5 /net/ipv4/ip_gre.c
parent[NET]: Annotate callers of csum_partial_copy_...() and csum_and_copy...() in ... (diff)
downloadlinux-5f92a7388a29594d6c365b23a48d4bb8299a3ea7.tar.xz
linux-5f92a7388a29594d6c365b23a48d4bb8299a3ea7.zip
[NET]: Annotate callers of the reset of checksum.h stuff.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
-rw-r--r--net/ipv4/ip_gre.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 2bf54adee8c2..476cb6084c75 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -877,7 +877,7 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
}
if (tunnel->parms.o_flags&GRE_CSUM) {
*ptr = 0;
- *(__be16*)ptr = ip_compute_csum((void*)(iph+1), skb->len - sizeof(struct iphdr));
+ *(__sum16*)ptr = ip_compute_csum((void*)(iph+1), skb->len - sizeof(struct iphdr));
}
}