From 37ad6b09d60f1667826284e8c0096d6117fab82d Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 18 Jun 2014 23:28:09 +0100 Subject: 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 `....(.@........ --- drivers/net/ethernet/freescale/fec.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'drivers/net/ethernet/freescale/fec.h') 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; -- cgit