Patchwork [net-next] atl1e:disable NETIF_F_TSO6 for hardware limit

login
register
mail settings
Submitter jie.yang@atheros.com
Date Dec. 2, 2009, 3:18 a.m.
Message ID <1259723914457-git-send-email-jie.yang@atheros.com>
Download mbox | patch
Permalink /patch/39962/
State Accepted
Delegated to: David Miller
Headers show

Comments

jie.yang@atheros.com - Dec. 2, 2009, 3:18 a.m.
From: Jie Yang <jie.yang@atheros.com>

For hardware limit to support TSOV6, just disable this feature
Signed-off-by: Jie Yang <jie.yang@atheros.com>
---

 drivers/net/atl1e/atl1e_main.c |   36 ------------------------------------
 1 files changed, 0 insertions(+), 36 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Dec. 2, 2009, 8:31 a.m.
From: <jie.yang@atheros.com>
Date: Wed, 2 Dec 2009 11:18:34 +0800

> From: Jie Yang <jie.yang@atheros.com>
> 
> For hardware limit to support TSOV6, just disable this feature
> Signed-off-by: Jie Yang <jie.yang@atheros.com>

Shouldn't we be applying this to net-2.6 since it's a bug fix?
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
jie.yang@atheros.com - Dec. 2, 2009, 8:34 a.m.
On Wednesday, December 02, 2009 4:32 PM
David Miller <davem@davemloft.net> wrote:
>
> From: <jie.yang@atheros.com>
> Date: Wed, 2 Dec 2009 11:18:34 +0800
>
> > From: Jie Yang <jie.yang@atheros.com>
> >
> > For hardware limit to support TSOV6, just disable this feature
> > Signed-off-by: Jie Yang <jie.yang@atheros.com>
>
> Shouldn't we be applying this to net-2.6 since it's a bug fix?
>
oh, It should applying to net-2.6.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Dec. 2, 2009, 8:37 a.m.
From: Jie Yang <Jie.Yang@Atheros.com>
Date: Wed, 2 Dec 2009 16:34:18 +0800

> On Wednesday, December 02, 2009 4:32 PM
> David Miller <davem@davemloft.net> wrote:
>>
>> From: <jie.yang@atheros.com>
>> Date: Wed, 2 Dec 2009 11:18:34 +0800
>>
>> > From: Jie Yang <jie.yang@atheros.com>
>> >
>> > For hardware limit to support TSOV6, just disable this feature
>> > Signed-off-by: Jie Yang <jie.yang@atheros.com>
>>
>> Shouldn't we be applying this to net-2.6 since it's a bug fix?
>>
> oh, It should applying to net-2.6.

Great, that's where I've applied it.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index ad17e74..08f8c09 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -1664,41 +1664,6 @@  static int atl1e_tso_csum(struct atl1e_adapter *adapter,
 			}
 			return 0;
 		}
-
-		if (offload_type & SKB_GSO_TCPV6) {
-			real_len = (((unsigned char *)ipv6_hdr(skb) - skb->data)
-					+ ntohs(ipv6_hdr(skb)->payload_len));
-			if (real_len < skb->len)
-				pskb_trim(skb, real_len);
-
-			/* check payload == 0 byte ? */
-			hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));
-			if (unlikely(skb->len == hdr_len)) {
-				/* only xsum need */
-				dev_warn(&pdev->dev,
-					"IPV6 tso with zero data??\n");
-				goto check_sum;
-			} else {
-				tcp_hdr(skb)->check = ~csum_ipv6_magic(
-						&ipv6_hdr(skb)->saddr,
-						&ipv6_hdr(skb)->daddr,
-						0, IPPROTO_TCP, 0);
-				tpd->word3 |= 1 << TPD_IP_VERSION_SHIFT;
-				hdr_len >>= 1;
-				tpd->word3 |= (hdr_len & TPD_V6_IPHLLO_MASK) <<
-					TPD_V6_IPHLLO_SHIFT;
-				tpd->word3 |= ((hdr_len >> 3) &
-					TPD_V6_IPHLHI_MASK) <<
-					TPD_V6_IPHLHI_SHIFT;
-				tpd->word3 |= (tcp_hdrlen(skb) >> 2 &
-					TPD_TCPHDRLEN_MASK) <<
-					TPD_TCPHDRLEN_SHIFT;
-				tpd->word3 |= ((skb_shinfo(skb)->gso_size) &
-					TPD_MSS_MASK) << TPD_MSS_SHIFT;
-					tpd->word3 |= 1 << TPD_SEGMENT_EN_SHIFT;
-			}
-		}
-		return 0;
 	}
 
 check_sum:
@@ -2287,7 +2252,6 @@  static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
 		NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
 	netdev->features |= NETIF_F_LLTX;
 	netdev->features |= NETIF_F_TSO;
-	netdev->features |= NETIF_F_TSO6;
 
 	return 0;
 }