diff options
| author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2013-08-21 09:11:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-21 20:38:16 -0700 |
| commit | 327dfd889527ff2313cc4734a3874e1de2e2e656 (patch) | |
| tree | 50a81e8acd6332b54dced4b75a94fcb3f8ffc7ba /drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |
| parent | e6b0260c2a154948be825b34e68135c127123d5a (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/stmmac/stmmac_main.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) */ static void stmmac_dma_operation_mode(struct stmmac_priv *priv) { - if (likely(priv->plat->force_sf_dma_mode || - ((priv->plat->tx_coe) && (!priv->no_csum_insertion)))) { + if (priv->plat->force_sf_dma_mode || priv->plat->tx_coe) { /* * In case of GMAC, SF mode can be enabled * to perform the TX COE in HW. This depends on: |