git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ixgbe
/
ixgbe_main.c
diff --git
a/drivers/net/ixgbe/ixgbe_main.c
b/drivers/net/ixgbe/ixgbe_main.c
index
439645d
..
6369852
100644
(file)
--- a/
drivers/net/ixgbe/ixgbe_main.c
+++ b/
drivers/net/ixgbe/ixgbe_main.c
@@
-5133,7
+5133,7
@@
static int ixgbe_tso(struct ixgbe_adapter *adapter,
iph->daddr, 0,
IPPROTO_TCP,
0);
- } else if (skb_
shinfo(skb)->gso_type == SKB_GSO_TCPV6
) {
+ } else if (skb_
is_gso_v6(skb)
) {
ipv6_hdr(skb)->payload_len = 0;
tcp_hdr(skb)->check =
~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,