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

Commit b548f976 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Use consistent types for interrupt coalescing parameters 



Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f85ee9c

drivers/net/ethernet/sfc/efx.c

+5 −5
Original line number Diff line number Diff line
@@ -1556,18 +1556,18 @@ static void efx_remove_all(struct efx_nic *efx) 
 *

 **************************************************************************/



static unsigned irq_mod_ticks(int usecs, int resolution)

static unsigned int irq_mod_ticks(unsigned int usecs, unsigned int resolution)

{

	if (usecs <= 0)

		return 0; /* cannot receive interrupts ahead of time :-) */

	if (usecs == 0)

		return 0;

	if (usecs < resolution)

		return 1; /* never round down to 0 */

	return usecs / resolution;

}



/* Set interrupt moderation parameters */

void efx_init_irq_moderation(struct efx_nic *efx, int tx_usecs, int rx_usecs,

			     bool rx_adaptive)

void efx_init_irq_moderation(struct efx_nic *efx, unsigned int tx_usecs,

			     unsigned int rx_usecs, bool rx_adaptive)

{

	struct efx_channel *channel;

	unsigned tx_ticks = irq_mod_ticks(tx_usecs, EFX_IRQ_MOD_RESOLUTION);

drivers/net/ethernet/sfc/efx.h

+2 −2
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ extern int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok); 


/* Global */

extern void efx_schedule_reset(struct efx_nic *efx, enum reset_type type);

extern void efx_init_irq_moderation(struct efx_nic *efx, int tx_usecs,

				    int rx_usecs, bool rx_adaptive);

extern void efx_init_irq_moderation(struct efx_nic *efx, unsigned int tx_usecs,

				    unsigned int rx_usecs, bool rx_adaptive);



/* Dummy PHY ops for PHY drivers */

extern int efx_port_dummy_op_int(struct efx_nic *efx);

drivers/net/ethernet/sfc/ethtool.c

+2 −1
Original line number Diff line number Diff line
@@ -625,7 +625,8 @@ static int efx_ethtool_set_coalesce(struct net_device *net_dev, 
{

	struct efx_nic *efx = netdev_priv(net_dev);

	struct efx_channel *channel;

	unsigned tx_usecs, rx_usecs, adaptive;

	unsigned int tx_usecs, rx_usecs;

	bool adaptive;



	if (coalesce->use_adaptive_tx_coalesce)

		return -EINVAL;