diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-20 21:07:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:27:18 -0500 |
| commit | ff1dcadb1b55dbf471c5ed109dbbdf06bd19ef3b (patch) | |
| tree | cbcd17d33ecc52c90d218b43c5aec430be448058 /drivers/net/myri10ge | |
| parent | 5b14027bf2132c0631ea9f3be11ced89a5057220 (diff) | |
[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/myri10ge')
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 806081b59733..36350e6db1c1 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
| @@ -1955,7 +1955,7 @@ again: | |||
| 1955 | flags = (MXGEFW_FLAGS_NO_TSO | MXGEFW_FLAGS_FIRST); | 1955 | flags = (MXGEFW_FLAGS_NO_TSO | MXGEFW_FLAGS_FIRST); |
| 1956 | if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) { | 1956 | if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) { |
| 1957 | cksum_offset = (skb->h.raw - skb->data); | 1957 | cksum_offset = (skb->h.raw - skb->data); |
| 1958 | pseudo_hdr_offset = (skb->h.raw + skb->csum) - skb->data; | 1958 | pseudo_hdr_offset = cksum_offset + skb->csum_offset; |
| 1959 | /* If the headers are excessively large, then we must | 1959 | /* If the headers are excessively large, then we must |
| 1960 | * fall back to a software checksum */ | 1960 | * fall back to a software checksum */ |
| 1961 | if (unlikely(cksum_offset > 255 || pseudo_hdr_offset > 127)) { | 1961 | if (unlikely(cksum_offset > 255 || pseudo_hdr_offset > 127)) { |