Skip to content

Commit

Permalink
sfc: fix boolreturn.cocci warning and rename function
Browse files Browse the repository at this point in the history
check_fcs() was returning bool as 0/1, which was a sign that the sense
 of the function was unclear: false was good, which doesn't really match
 a name like 'check_$thing'.  So rename it to ef100_has_fcs_error(), and
 use proper booleans in the return statements.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Edward Cree authored and David S. Miller committed Aug 25, 2020
1 parent 59ebb43 commit 966b826
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/ethernet/sfc/ef100_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ bool ef100_rx_buf_hash_valid(const u8 *prefix)
return PREFIX_FIELD(prefix, RSS_HASH_VALID);
}

static bool check_fcs(struct efx_channel *channel, u32 *prefix)
static bool ef100_has_fcs_error(struct efx_channel *channel, u32 *prefix)
{
u16 rxclass;
u8 l2status;
Expand All @@ -46,11 +46,11 @@ static bool check_fcs(struct efx_channel *channel, u32 *prefix)

if (likely(l2status == ESE_GZ_RH_HCLASS_L2_STATUS_OK))
/* Everything is ok */
return 0;
return false;

if (l2status == ESE_GZ_RH_HCLASS_L2_STATUS_FCS_ERR)
channel->n_rx_eth_crc_err++;
return 1;
return true;
}

void __ef100_rx_packet(struct efx_channel *channel)
Expand All @@ -63,7 +63,7 @@ void __ef100_rx_packet(struct efx_channel *channel)

prefix = (u32 *)(eh - ESE_GZ_RX_PKT_PREFIX_LEN);

if (check_fcs(channel, prefix) &&
if (ef100_has_fcs_error(channel, prefix) &&
unlikely(!(efx->net_dev->features & NETIF_F_RXALL)))
goto out;

Expand Down

0 comments on commit 966b826

Please sign in to comment.