aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/et131x/et131x.c
diff options
context:
space:
mode:
authorMark Einon <mark.einon@gmail.com>2014-09-14 16:59:07 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-19 16:05:19 -0700
commitee60c8ec323167a02de357e9d9b44af850052ee3 (patch)
treec0e1d1ba010678810df43ddf1934dbbc55694ce2 /drivers/staging/et131x/et131x.c
parentstaging: et131x: Remove spaces after casts (diff)
downloadlinux-dev-ee60c8ec323167a02de357e9d9b44af850052ee3.tar.xz
linux-dev-ee60c8ec323167a02de357e9d9b44af850052ee3.zip
staging: et131x: Use braces on all arms of if/else statements
In some places in et131x.c, one arm of am if/else statement has braces and the other not - put braces on both arms where this happens. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/et131x/et131x.c')
-rw-r--r--drivers/staging/et131x/et131x.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 12bde766e2c5..3f402476f4c2 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -2742,8 +2742,9 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)
tcb->index = NUM_DESC_PER_RING_TX - 1;
else
tcb->index = ET_DMA10_WRAP|(NUM_DESC_PER_RING_TX - 1);
- } else
+ } else {
tcb->index = tx_ring->send_idx - 1;
+ }
spin_lock(&adapter->tcb_send_qlock);
@@ -4021,8 +4022,9 @@ static int et131x_set_packet_filter(struct et131x_adapter *adapter)
if (filter & ET131X_PACKET_TYPE_BROADCAST) {
pf_ctrl |= 1; /* Broadcast filter bit */
ctrl &= ~0x04;
- } else
+ } else {
pf_ctrl &= ~1;
+ }
/* Setup the receive mac configuration registers - Packet
* Filter control + the enable / disable for packet filter
@@ -4070,8 +4072,9 @@ static void et131x_multicast(struct net_device *netdev)
if (netdev_mc_count(netdev) < 1) {
adapter->packet_filter &= ~ET131X_PACKET_TYPE_ALL_MULTICAST;
adapter->packet_filter &= ~ET131X_PACKET_TYPE_MULTICAST;
- } else
+ } else {
adapter->packet_filter |= ET131X_PACKET_TYPE_MULTICAST;
+ }
/* Set values in the private adapter struct */
i = 0;