From 5b0ffc1ee432ebc1f725a2a4e9ec2ed038de4ec3 Mon Sep 17 00:00:00 2001 From: Daniel Hellstrom Date: Fri, 9 Sep 2011 05:17:54 +0000 Subject: [PATCH] --- yaml --- r: 264057 b: refs/heads/master c: d706f00f65146822c0097b796b3557ea8980c305 h: refs/heads/master i: 264055: e7dba6f823e7ea1a67ca2c056f950c91bc2b99f8 v: v3 --- [refs] | 2 +- trunk/drivers/net/greth.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d2f6e3cdd6af..201edd89450f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6af29a963cecf426966d56935d60a984bd5594ea +refs/heads/master: d706f00f65146822c0097b796b3557ea8980c305 diff --git a/trunk/drivers/net/greth.c b/trunk/drivers/net/greth.c index 58ec74a73150..52a39000c42c 100644 --- a/trunk/drivers/net/greth.c +++ b/trunk/drivers/net/greth.c @@ -491,7 +491,8 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) if (nr_frags != 0) status = GRETH_TXBD_MORE; - status |= GRETH_TXBD_CSALL; + if (skb->ip_summed == CHECKSUM_PARTIAL) + status |= GRETH_TXBD_CSALL; status |= skb_headlen(skb) & GRETH_BD_LEN; if (greth->tx_next == GRETH_TXBD_NUM_MASK) status |= GRETH_BD_WR; @@ -514,7 +515,9 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) greth->tx_skbuff[curr_tx] = NULL; bdp = greth->tx_bd_base + curr_tx; - status = GRETH_TXBD_CSALL | GRETH_BD_EN; + status = GRETH_BD_EN; + if (skb->ip_summed == CHECKSUM_PARTIAL) + status |= GRETH_TXBD_CSALL; status |= frag->size & GRETH_BD_LEN; /* Wrap around descriptor ring */