From ae4167317185c3fc4a011fc375c301f0e296a02e Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 14 Nov 2006 21:37:14 -0800 Subject: [PATCH] --- yaml --- r: 41718 b: refs/heads/master c: 2bbbc86890ac4c911c5057f69af93853e52a42a8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 4 ++-- trunk/net/core/skbuff.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8990f3b913bc..85d73bad26dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f92a7388a29594d6c365b23a48d4bb8299a3ea7 +refs/heads/master: 2bbbc86890ac4c911c5057f69af93853e52a42a8 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 64fa7f4c702d..784129fb61d4 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -1334,8 +1334,8 @@ extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, extern void skb_free_datagram(struct sock *sk, struct sk_buff *skb); extern void skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags); -extern unsigned int skb_checksum(const struct sk_buff *skb, int offset, - int len, unsigned int csum); +extern __wsum skb_checksum(const struct sk_buff *skb, int offset, + int len, __wsum csum); extern int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len); extern int skb_store_bits(const struct sk_buff *skb, int offset, diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 6e8c15b39eb8..be9b541f536f 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -1240,8 +1240,8 @@ EXPORT_SYMBOL(skb_store_bits); /* Checksum skb data. */ -unsigned int skb_checksum(const struct sk_buff *skb, int offset, - int len, unsigned int csum) +__wsum skb_checksum(const struct sk_buff *skb, int offset, + int len, __wsum csum) { int start = skb_headlen(skb); int i, copy = start - offset;