diff options
| author |   Mark Einon <mark.einon@gmail.com> | 2014-09-22 20:58:15 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-23 11:35:08 -0700 |
| commit | c9e3c03a76f13dd8ba1e6c941b0d115da5e7839b (patch) | |
| tree | 81ec942f86392ae6a5005d6c1857f53be7c20d3d /drivers/staging/et131x | |
| parent | staging: et131x: Reduce split lines by renaming some psr variables (diff) | |
| download | linux-dev-c9e3c03a76f13dd8ba1e6c941b0d115da5e7839b.tar.xz linux-dev-c9e3c03a76f13dd8ba1e6c941b0d115da5e7839b.zip | |
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 <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/et131x')
| -rw-r--r-- | drivers/staging/et131x/et131x.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; |