Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux-2.6-microblaze.git] / drivers / net / ethernet / qualcomm / emac / emac-mac.c

diff --git a/drivers/net/ethernet/qualcomm/emac/emac-mac.c b/drivers/net/ethernet/qualcomm/emac/emac-mac.c
index bebe38d..251d4ac 100644 (file)
--- a/drivers/net/ethernet/qualcomm/emac/emac-mac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac-mac.c
@@ -1288,11 +1288,8 @@ static int emac_tso_csum(struct emac_adapter *adpt,
                        memset(tpd, 0, sizeof(*tpd));
                        memset(&extra_tpd, 0, sizeof(extra_tpd));
 
-                       ipv6_hdr(skb)->payload_len = 0;
-                       tcp_hdr(skb)->check =
-                               ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                                &ipv6_hdr(skb)->daddr,
-                                                0, IPPROTO_TCP, 0);
+                       tcp_v6_gso_csum_prep(skb);
+
                        TPD_PKT_LEN_SET(&extra_tpd, skb->len);
                        TPD_LSO_SET(&extra_tpd, 1);
                        TPD_LSOV_SET(&extra_tpd, 1);