From: Mark Einon Date: Mon, 22 Sep 2014 19:58:15 +0000 (+0100) Subject: staging: et131x: Use braces on all arms of if/else in et131x_handle_recv_pkts X-Git-Tag: v3.18-rc1~130^2~268 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c9e3c03a76f13dd8ba1e6c941b0d115da5e7839b;p=karo-tx-linux.git staging: et131x: Use braces on all arms of if/else in et131x_handle_recv_pkts The 'if' blocks have braces, so the 'else' blocks should too. Signed-off-by: Mark Einon Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index a000581ab821..a219ba350a55 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -2494,9 +2494,10 @@ static int et131x_handle_recv_pkts(struct et131x_adapter *adapter, int budget) rx_ring->unfinished_receives = true; writel(PARM_TX_TIME_INT_DEF * NANO_IN_A_MICRO, &adapter->regs->global.watchdog_timer); - } else + } else { /* Watchdog timer will disable itself if appropriate. */ rx_ring->unfinished_receives = false; + } return count; } @@ -2679,9 +2680,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) } else { /* Last element */ desc[frag - 1].flags = TXDESC_FLAG_LASTPKT; } - } else + } else { desc[frag - 1].flags = TXDESC_FLAG_INTPROC | TXDESC_FLAG_LASTPKT; + } desc[0].flags |= TXDESC_FLAG_FIRSTPKT;