aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e
diff options
context:
space:
mode:
authorSridhar Samudrala <sri@us.ibm.com>2010-01-23 05:02:21 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-23 05:02:21 -0500
commit8e1e8a4779cb23c1d9f51e9223795e07ec54d77a (patch)
treee381b1cacfdc3351574d650dc0dbf77ada2e91a4 /drivers/net/e1000e
parent8581145f39c39b00cd1b6a2dcb4ce5bf7d8d6070 (diff)
net: Fix IPv6 GSO type checks in Intel ethernet drivers
Found this problem when testing IPv6 from a KVM guest to a remote host via e1000e device on the host. The following patch fixes the check for IPv6 GSO packet in Intel ethernet drivers to use skb_is_gso_v6(). SKB_GSO_DODGY is also set when packets are forwarded from a guest. Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r--drivers/net/e1000e/netdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 3d887104a0d..57f149b75fb 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3786,7 +3786,7 @@ static int e1000_tso(struct e1000_adapter *adapter,
3786 0, IPPROTO_TCP, 0); 3786 0, IPPROTO_TCP, 0);
3787 cmd_length = E1000_TXD_CMD_IP; 3787 cmd_length = E1000_TXD_CMD_IP;
3788 ipcse = skb_transport_offset(skb) - 1; 3788 ipcse = skb_transport_offset(skb) - 1;
3789 } else if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6) { 3789 } else if (skb_is_gso_v6(skb)) {
3790 ipv6_hdr(skb)->payload_len = 0; 3790 ipv6_hdr(skb)->payload_len = 0;
3791 tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr, 3791 tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
3792 &ipv6_hdr(skb)->daddr, 3792 &ipv6_hdr(skb)->daddr,