aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 18:07:29 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:27:18 -0800
commitff1dcadb1b55dbf471c5ed109dbbdf06bd19ef3b (patch)
treecbcd17d33ecc52c90d218b43c5aec430be448058 /net/core
parent5b14027bf2132c0631ea9f3be11ced89a5057220 (diff)
downloadkernel_samsung_tuna-ff1dcadb1b55dbf471c5ed109dbbdf06bd19ef3b.zip
kernel_samsung_tuna-ff1dcadb1b55dbf471c5ed109dbbdf06bd19ef3b.tar.gz
kernel_samsung_tuna-ff1dcadb1b55dbf471c5ed109dbbdf06bd19ef3b.tar.bz2
[NET]: Split skb->csum
... into anonymous union of __wsum and __u32 (csum and csum_offset resp.) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c4
-rw-r--r--net/core/skbuff.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 1a36b17..59d058a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1191,9 +1191,9 @@ int skb_checksum_help(struct sk_buff *skb)
offset = skb->tail - skb->h.raw;
BUG_ON(offset <= 0);
- BUG_ON(skb->csum + 2 > offset);
+ BUG_ON(skb->csum_offset + 2 > offset);
- *(__sum16*)(skb->h.raw + skb->csum) = csum_fold(csum);
+ *(__sum16*)(skb->h.raw + skb->csum_offset) = csum_fold(csum);
out_set_summed:
skb->ip_summed = CHECKSUM_NONE;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 07c25d6..a90bc43 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1414,7 +1414,7 @@ void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to)
skb->len - csstart, 0);
if (skb->ip_summed == CHECKSUM_PARTIAL) {
- long csstuff = csstart + skb->csum;
+ long csstuff = csstart + skb->csum_offset;
*((__sum16 *)(to + csstuff)) = csum_fold(csum);
}