summaryrefslogtreecommitdiffstats
path: root/drivers/net/sunhme.c
diff options
context:
space:
mode:
authorAl Viro2006-11-21 03:07:29 +0100
committerDavid S. Miller2006-12-03 06:27:18 +0100
commitff1dcadb1b55dbf471c5ed109dbbdf06bd19ef3b (patch)
treecbcd17d33ecc52c90d218b43c5aec430be448058 /drivers/net/sunhme.c
parent[NETFILTER]: ip_nat_snmp_basic annotations. (diff)
downloadkernel-qcow2-linux-ff1dcadb1b55dbf471c5ed109dbbdf06bd19ef3b.tar.gz
kernel-qcow2-linux-ff1dcadb1b55dbf471c5ed109dbbdf06bd19ef3b.tar.xz
kernel-qcow2-linux-ff1dcadb1b55dbf471c5ed109dbbdf06bd19ef3b.zip
[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 'drivers/net/sunhme.c')
-rw-r--r--drivers/net/sunhme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 9d7cd130c19d..ec432ea879fb 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2272,7 +2272,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)
u32 csum_start_off, csum_stuff_off;
csum_start_off = (u32) (skb->h.raw - skb->data);
- csum_stuff_off = (u32) ((skb->h.raw + skb->csum) - skb->data);
+ csum_stuff_off = csum_start_off + skb->csum_offset;
tx_flags = (TXFLAG_OWN | TXFLAG_CSENABLE |
((csum_start_off << 14) & TXFLAG_CSBUFBEGIN) |