Home » Mailing list archives » git-commits-head » 2010 » July » 8

mv643xx_eth: use sw csum for big packets

Previous thread: Bluetooth: Fix abuse of the preincrement operator by Linux Kernel Mailing List on Wednesday, July 7, 2010 - 7:59 pm. (1 message)

Next thread: drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h by Linux Kernel Mailing List on Wednesday, July 7, 2010 - 7:59 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: mv643xx_eth: use sw csum for big packets
Date: Wednesday, July 7, 2010 - 7:59 pm

Gitweb:     http://git.kernel.org/linus/9b2c2ff7a1c04e69842254dd4afe0f8ad4efa439
Commit:     9b2c2ff7a1c04e69842254dd4afe0f8ad4efa439
Parent:     08e554b17bfdc2682599c8c2770b088a0187a405
Author:     Saeed Bishara <saeed@marvell.com>
AuthorDate: Sun Jun 27 00:26:43 2010 +0000
Committer:  David S. Miller <davem@davemloft.net>
CommitDate: Wed Jun 30 13:01:11 2010 -0700

    mv643xx_eth: use sw csum for big packets
    
    Some controllers (KW, Dove) limits the TX IP/layer4 checksum offloading to a max size.
    
    Signed-off-by: Saeed Bishara <saeed@marvell.com>
    Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/mv643xx_eth.c   |    9 +++++++--
 include/linux/mv643xx_eth.h |    5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index e345ec8..73bb8ea 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -289,6 +289,7 @@ struct mv643xx_eth_shared_private {
 	unsigned int t_clk;
 	int extended_rx_coal_limit;
 	int tx_bw_control;
+	int tx_csum_limit;
 };
 
 #define TX_BW_CONTROL_ABSENT		0
@@ -776,13 +777,16 @@ static int txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)
 	l4i_chk = 0;
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
+		int hdr_len;
 		int tag_bytes;
 
 		BUG_ON(skb->protocol != htons(ETH_P_IP) &&
 		       skb->protocol != htons(ETH_P_8021Q));
 
-		tag_bytes = (void *)ip_hdr(skb) - (void *)skb->data - ETH_HLEN;
-		if (unlikely(tag_bytes & ~12)) {
+		hdr_len = (void *)ip_hdr(skb) - (void *)skb->data;
+		tag_bytes = hdr_len - ETH_HLEN;
+		if (skb->len - hdr_len > mp->shared->tx_csum_limit ||
+		    unlikely(tag_bytes & ~12)) {
 			if (skb_checksum_help(skb) == 0)
 				goto no_csum;
 			kfree_skb(skb);
@@ -2666,6 +2670,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
 	 * Detect hardware parameters.
 	 */
 	msp->t_clk = (pd != NULL && pd->t_clk ...
[ message continues ]
Previous thread: Bluetooth: Fix abuse of the preincrement operator by Linux Kernel Mailing List on Wednesday, July 7, 2010 - 7:59 pm. (1 message)

Next thread: drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h by Linux Kernel Mailing List on Wednesday, July 7, 2010 - 7:59 pm. (1 message)