diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-09-19 23:50:15 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-09-19 23:50:15 +0000 |
| commit | eff940575233f99198aff8429c3bc4500a32ce2d (patch) | |
| tree | 606eb169fcd5b9f50ca226b5f691ab03bf6ce00f /target/linux/cns3xxx | |
| parent | dd1fb8289f564c0fe9f1707df415d8f35e03f478 (diff) | |
| download | upstream-eff940575233f99198aff8429c3bc4500a32ce2d.tar.gz upstream-eff940575233f99198aff8429c3bc4500a32ce2d.tar.bz2 upstream-eff940575233f99198aff8429c3bc4500a32ce2d.zip | |
cns3xxx: fix ethernet tx checksum offload
SVN-Revision: 33490
Diffstat (limited to 'target/linux/cns3xxx')
| -rw-r--r-- | target/linux/cns3xxx/patches-3.3/400-ethernet_fix_tx_csum_offload.patch | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/target/linux/cns3xxx/patches-3.3/400-ethernet_fix_tx_csum_offload.patch b/target/linux/cns3xxx/patches-3.3/400-ethernet_fix_tx_csum_offload.patch new file mode 100644 index 0000000000..e5dc838b9c --- /dev/null +++ b/target/linux/cns3xxx/patches-3.3/400-ethernet_fix_tx_csum_offload.patch @@ -0,0 +1,89 @@ +--- a/drivers/net/ethernet/cavium/cns3xxx_eth.c ++++ b/drivers/net/ethernet/cavium/cns3xxx_eth.c +@@ -666,6 +666,7 @@ static int eth_xmit(struct sk_buff *skb, + int nr_frags = skb_shinfo(skb)->nr_frags; + struct skb_frag_struct *frag; + unsigned int i; ++ u32 config0 = 0; + + if (pmap == 8) + pmap = (1 << 4); +@@ -691,6 +692,10 @@ static int eth_xmit(struct sk_buff *skb, + + spin_unlock(&tx_lock); + ++ config0 = FORCE_ROUTE; ++ if (skb->ip_summed == CHECKSUM_PARTIAL) ++ config0 |= UDP_CHECKSUM | TCP_CHECKSUM; ++ + if (!nr_frags) { + tx_desc = &(tx_ring)->desc[index]; + +@@ -704,23 +709,14 @@ static int eth_xmit(struct sk_buff *skb, + tx_ring->phys_tab[index] = phys; + + tx_ring->buff_tab[index] = skb; +- if (index == TX_DESCS - 1) { +- tx_desc->config0 = END_OF_RING | FIRST_SEGMENT | LAST_SEGMENT | +- FORCE_ROUTE | IP_CHECKSUM | UDP_CHECKSUM | +- TCP_CHECKSUM | len; +- } else { +- tx_desc->config0 = FIRST_SEGMENT | LAST_SEGMENT | +- FORCE_ROUTE | IP_CHECKSUM | UDP_CHECKSUM | +- TCP_CHECKSUM | len; +- } ++ config0 |= FIRST_SEGMENT | LAST_SEGMENT; + } else { +- unsigned int config; +- + index = ((index + nr_frags) % TX_DESCS); + tx_desc = &(tx_ring)->desc[index]; + + /* fragments */ + for (i = nr_frags; i > 0; i--) { ++ u32 config; + void *addr; + + frag = &skb_shinfo(skb)->frags[i-1]; +@@ -735,8 +731,7 @@ static int eth_xmit(struct sk_buff *skb, + tx_desc->pmap = pmap; + tx_ring->phys_tab[index] = phys; + +- config = FORCE_ROUTE | IP_CHECKSUM | UDP_CHECKSUM | +- TCP_CHECKSUM | len; ++ config = config0 | len; + if (i == nr_frags) { + config |= LAST_SEGMENT; + tx_ring->buff_tab[index] = skb; +@@ -757,24 +752,19 @@ static int eth_xmit(struct sk_buff *skb, + /* header */ + len = skb->len - skb->data_len; + +- phys = dma_map_single(NULL, skb->data, len, +- DMA_TO_DEVICE); ++ phys = dma_map_single(NULL, skb->data, len, DMA_TO_DEVICE); + + tx_desc->sdp = phys; + tx_desc->pmap = pmap; + tx_ring->phys_tab[index] = phys; +- +- if (index == TX_DESCS - 1) { +- tx_desc->config0 = END_OF_RING | FIRST_SEGMENT | +- FORCE_ROUTE | IP_CHECKSUM | UDP_CHECKSUM | +- TCP_CHECKSUM | len; +- } else { +- tx_desc->config0 = FIRST_SEGMENT | +- FORCE_ROUTE | IP_CHECKSUM | UDP_CHECKSUM | +- TCP_CHECKSUM | len; +- } ++ config0 |= FIRST_SEGMENT; + } + ++ if (index == TX_DESCS - 1) ++ config0 |= END_OF_RING; ++ ++ tx_desc->config0 = config0 | len; ++ + mb(); + + spin_lock(&tx_lock); |