leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: smc911x: Clean up the status handling in smc911x_recv()

Browse Source 
Invert the status handling logic in smc911x_recv(), to make the
function easier to read, no functional change.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Marek Vasut
2020-03-15 17:02:05 +01:00
committed by marex
parent 3dbab92603
commit b11c8bbfaf
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/smc911x.c
View File

@@ -352,23 +352,25 @@ static int smc911x_recv(struct eth_device *dev)
u32 pktlen, tmplen; u32 pktlen, tmplen;
u32 status; u32 status;
if ((smc911x_reg_read(priv, RX_FIFO_INF) & RX_FIFO_INF_RXSUSED) >> 16) { status = smc911x_reg_read(priv, RX_FIFO_INF);
status = smc911x_reg_read(priv, RX_STATUS_FIFO); if (!(status & RX_FIFO_INF_RXSUSED))
pktlen = (status & RX_STS_PKT_LEN) >> 16; return 0;
smc911x_reg_write(priv, RX_CFG, 0); status = smc911x_reg_read(priv, RX_STATUS_FIFO);
pktlen = (status & RX_STS_PKT_LEN) >> 16;
tmplen = (pktlen + 3) / 4; smc911x_reg_write(priv, RX_CFG, 0);
while (tmplen--)
*data++ = smc911x_reg_read(priv, RX_DATA_FIFO);
if (status & RX_STS_ES) tmplen = (pktlen + 3) / 4;
printf(DRIVERNAME while (tmplen--)
": dropped bad packet. Status: 0x%08x\n", *data++ = smc911x_reg_read(priv, RX_DATA_FIFO);
status);
else if (status & RX_STS_ES)
net_process_received_packet(net_rx_packets[0], pktlen); printf(DRIVERNAME
} ": dropped bad packet. Status: 0x%08x\n",
status);
else
net_process_received_packet(net_rx_packets[0], pktlen);
return 0; return 0;
} }