diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /drivers/net/myri10ge | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
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 98703e086ee7..38df42802386 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)) { |