summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-04-23 17:06:40 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:28:41 -0700
commit628592ccdbbb5bb751217cf02e2e7abb500d7ffe (patch)
treea81d6b2e87893851d36ffaa87c8f8757f4e13794 /drivers/net/e1000
parent663ead3bb8d5b561e70fc3bb3861c9220b5a77eb (diff)
downloadop-kernel-dev-628592ccdbbb5bb751217cf02e2e7abb500d7ffe.zip
op-kernel-dev-628592ccdbbb5bb751217cf02e2e7abb500d7ffe.tar.gz
[NETDRV]: Perform missing csum_offset conversions
When csum_offset was introduced we did a conversion from csum to csum_offset where applicable. A couple of drivers were missed in this process. It was harmless to begin with since the two fields coincided. Now that we've made them different with the addition of csum_start, the missed drivers must be converted or they can't send packets out at all that require checksum offload. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 610216e..48e2ade 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2959,7 +2959,8 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
context_desc->lower_setup.ip_config = 0;
context_desc->upper_setup.tcp_fields.tucss = css;
- context_desc->upper_setup.tcp_fields.tucso = css + skb->csum;
+ context_desc->upper_setup.tcp_fields.tucso =
+ css + skb->csum_offset;
context_desc->upper_setup.tcp_fields.tucse = 0;
context_desc->tcp_seg_setup.data = 0;
context_desc->cmd_and_length = cpu_to_le32(E1000_TXD_CMD_DEXT);
OpenPOWER on IntegriCloud