diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-18 23:28:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-10-17 14:35:35 +0100 |
| commit | 37ad6b09d60f1667826284e8c0096d6117fab82d (patch) | |
| tree | d63bdcfcaa05e3d4fa56fa786630124efdf2bd4a /drivers/net/ethernet/freescale/fec.h | |
| parent | 3981daaed7772bf25b0f96323520e53bc78bf8cd (diff) | |
Revert FEC commits
This reverts commit d5e42c86e07935f3cab4dcfca787a733146d0c70
("net: fec: Don't clear IPV6 header checksum field when IP accelerator enable").
This reverts commit 79f339125ea316e910220e5f5b4ad30370f4de85
("net: fec: Add software TSO support"), as 96c50caa5148 ("net: fec:
Enable IP header hardware checksum") causes a regression with IPv6 by
overwriting the location where the IPv4 header checksum would be:
- 0x0000: 6000 0000 0028 0640 fd8f 7570 feb6 0001 `....(.@..up....
+ 0x0000: 6000 0000 0028 0640 fd8f 0000 feb6 0001 `....(.@........
This reverts commit 96c50caa5148e0e0a077672574785700885c6764
("net: fec: Enable IP header hardware checksum"), as it causes a
regression with IPv6 by overwriting the location where the IPv4
header checksum would be:
- 0x0000: 6000 0000 0028 0640 fd8f 7570 feb6 0001 `....(.@..up....
+ 0x0000: 6000 0000 0028 0640 fd8f 0000 feb6 0001 `....(.@........
Diffstat (limited to 'drivers/net/ethernet/freescale/fec.h')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index 6f576a3cc204..4777242aab79 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -303,12 +303,6 @@ struct fec_enet_private { unsigned short tx_ring_size; unsigned short rx_ring_size; - unsigned short tx_stop_threshold; - unsigned short tx_wake_threshold; - - /* Software TSO */ - char *tso_hdrs; - dma_addr_t tso_hdrs_dma; unsigned char flags; |