iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stmmac: remove useless csum flag

Browse Source 
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>
This commit is contained in:
Giuseppe CAVALLARO
2013-08-21 09:11:14 +02:00
committed by David S. Miller
parent e6b0260c2a
commit 327dfd8895
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/stmicro/stmmac/stmmac.h
View File

@ -70,7 +70,6 @@ struct stmmac_priv {
struct net_device *dev; struct net_device *dev;
struct device *device; struct device *device;
struct mac_device_info *hw; struct mac_device_info *hw;
int no_csum_insertion;
spinlock_t lock; spinlock_t lock;
struct phy_device *phydev ____cacheline_aligned_in_smp; struct phy_device *phydev ____cacheline_aligned_in_smp;

3
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View File

@ -1224,8 +1224,7 @@ static void free_dma_desc_resources(struct stmmac_priv *priv)
*/ */
static void stmmac_dma_operation_mode(struct stmmac_priv *priv) static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
{ {
if (likely(priv->plat->force_sf_dma_mode || if (priv->plat->force_sf_dma_mode || priv->plat->tx_coe) {
((priv->plat->tx_coe) && (!priv->no_csum_insertion)))) {
/* /*
* In case of GMAC, SF mode can be enabled * In case of GMAC, SF mode can be enabled
* to perform the TX COE in HW. This depends on: * to perform the TX COE in HW. This depends on: