aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/stmicro
diff options
context:
space:
mode:
authorGiuseppe CAVALLARO <peppe.cavallaro@st.com>2013-08-21 03:11:14 -0400
committerDavid S. Miller <davem@davemloft.net>2013-08-21 23:38:16 -0400
commit327dfd889527ff2313cc4734a3874e1de2e2e656 (patch)
tree50a81e8acd6332b54dced4b75a94fcb3f8ffc7ba /drivers/net/ethernet/stmicro
parente6b0260c2a154948be825b34e68135c127123d5a (diff)
stmmac: remove useless csum flag
This patch removes the no_csum_insertion private parameter that is not used anymore and, also, the "likely" annotation from the condition that is not in a critical path. Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Cc: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac.h1
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index c922fde929a1..f16a9bdf45bb 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -70,7 +70,6 @@ struct stmmac_priv {
70 struct net_device *dev; 70 struct net_device *dev;
71 struct device *device; 71 struct device *device;
72 struct mac_device_info *hw; 72 struct mac_device_info *hw;
73 int no_csum_insertion;
74 spinlock_t lock; 73 spinlock_t lock;
75 74
76 struct phy_device *phydev ____cacheline_aligned_in_smp; 75 struct phy_device *phydev ____cacheline_aligned_in_smp;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 0a9bb9d30c3f..be406911fd01 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1224,8 +1224,7 @@ static void free_dma_desc_resources(struct stmmac_priv *priv)
1224 */ 1224 */
1225static void stmmac_dma_operation_mode(struct stmmac_priv *priv) 1225static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
1226{ 1226{
1227 if (likely(priv->plat->force_sf_dma_mode || 1227 if (priv->plat->force_sf_dma_mode || priv->plat->tx_coe) {
1228 ((priv->plat->tx_coe) && (!priv->no_csum_insertion)))) {
1229 /* 1228 /*
1230 * In case of GMAC, SF mode can be enabled 1229 * In case of GMAC, SF mode can be enabled
1231 * to perform the TX COE in HW. This depends on: 1230 * to perform the TX COE in HW. This depends on: