Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a84bc2a9 authored by Mugunthan V N's avatar Mugunthan V N Committed by David S. Miller
Browse files

drivers: net: cpsw: disable coalesce when rx_coalesce_usecs is zero 



instead of return error on zero rx_coalesce_usecs, disable coalesce

Signed-off-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff11d8b2

drivers/net/ethernet/ti/cpsw.c

+7 −3
Original line number Diff line number Diff line
@@ -884,14 +884,16 @@ static int cpsw_set_coalesce(struct net_device *ndev, 
	u32 addnl_dvdr = 1;

	u32 coal_intvl = 0;



	if (!coal->rx_coalesce_usecs)

		return -EINVAL;



	coal_intvl = coal->rx_coalesce_usecs;



	int_ctrl =  readl(&priv->wr_regs->int_control);

	prescale = priv->bus_freq_mhz * 4;



	if (!coal->rx_coalesce_usecs) {

		int_ctrl &= ~(CPSW_INTPRESCALE_MASK | CPSW_INTPACEEN);

		goto update_return;

	}



	if (coal_intvl < CPSW_CMINTMIN_INTVL)

		coal_intvl = CPSW_CMINTMIN_INTVL;
@@ -919,6 +921,8 @@ static int cpsw_set_coalesce(struct net_device *ndev, 
	int_ctrl |= CPSW_INTPACEEN;

	int_ctrl &= (~CPSW_INTPRESCALE_MASK);

	int_ctrl |= (prescale & CPSW_INTPRESCALE_MASK);



update_return:

	writel(int_ctrl, &priv->wr_regs->int_control);



	cpsw_notice(priv, timer, "Set coalesce to %d usecs.\n", coal_intvl);