diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-06-16 03:37:05 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2019-04-02 23:43:52 +0200 |
| commit | f0d5bec69ef2dc6c571122ca435c57aa9258dca8 (patch) | |
| tree | 963443ebcf468a358be6065f2cd569092acfb523 | |
| parent | b0063c8a1dd97d6bd3daece7abfb38ce4f4e10a0 (diff) | |
NET: ROSE: Remove braces around single statement if and else blocks.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | net/rose/af_rose.c | 6 | ||||
| -rw-r--r-- | net/rose/rose_in.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 10f07c9a7406..cf8b6e9b026d 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -719,9 +719,8 @@ static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) for (n = 0 ; n < addr->srose_ndigis ; n++) rose->source_digis[n] = full_addr->srose_digis[n]; } else { - if (rose->source_ndigis == 1) { + if (rose->source_ndigis == 1) rose->source_digis[0] = addr->srose_digi; - } } rose_insert_socket(sk); @@ -826,9 +825,8 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le for (n = 0 ; n < addr->srose_ndigis ; n++) rose->dest_digis[n] = full_addr->srose_digis[n]; } else { - if (rose->dest_ndigis == 1) { + if (rose->dest_ndigis == 1) rose->dest_digis[0] = addr->srose_digi; - } } /* Move to connecting socket, start sending Connect Requests */ diff --git a/net/rose/rose_in.c b/net/rose/rose_in.c index 8b345e9817a4..c0de71ce0bff 100644 --- a/net/rose/rose_in.c +++ b/net/rose/rose_in.c @@ -140,11 +140,10 @@ static int rose_state3_machine(struct sock *sk, struct sk_buff *skb, int framety rose_stop_idletimer(sk); } else { rose_frames_acked(sk, nr); - if (frametype == ROSE_RNR) { + if (frametype == ROSE_RNR) rose->condition |= ROSE_COND_PEER_RX_BUSY; - } else { + else rose->condition &= ~ROSE_COND_PEER_RX_BUSY; - } } break; |