diff options
| -rw-r--r-- | net/rose/rose_route.c | 3 | ||||
| -rw-r--r-- | net/rose/rose_subr.c | 12 |
2 files changed, 5 insertions, 10 deletions
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c index b4ec4eb5c5c5..f8a0373b221d 100644 --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c @@ -946,8 +946,7 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25) sk->sk_state_change(sk); sock_set_flag(sk, SOCK_DEAD); } - } - else { + } else { skb_reset_transport_header(skb); res = rose_process_rx_frame(sk, skb); goto out; diff --git a/net/rose/rose_subr.c b/net/rose/rose_subr.c index 98a81942b3ea..153165aac203 100644 --- a/net/rose/rose_subr.c +++ b/net/rose/rose_subr.c @@ -285,26 +285,22 @@ static int rose_parse_national(unsigned char *p, struct rose_facilities_struct * memcpy(&facilities->source_digis[0], p + 2, AX25_ADDR_LEN); facilities->source_ndigis = 1; } - } - else if (*p == FAC_NATIONAL_SRC_DIGI) { + } else if (*p == FAC_NATIONAL_SRC_DIGI) { if (!fac_national_digis_received) { if (l < AX25_ADDR_LEN) return -1; memcpy(&facilities->dest_digis[0], p + 2, AX25_ADDR_LEN); facilities->dest_ndigis = 1; } - } - else if (*p == FAC_NATIONAL_FAIL_CALL) { + } else if (*p == FAC_NATIONAL_FAIL_CALL) { if (l < AX25_ADDR_LEN) return -1; memcpy(&facilities->fail_call, p + 2, AX25_ADDR_LEN); - } - else if (*p == FAC_NATIONAL_FAIL_ADD) { + } else if (*p == FAC_NATIONAL_FAIL_ADD) { if (l < 1 + ROSE_ADDR_LEN) return -1; memcpy(&facilities->fail_addr, p + 3, ROSE_ADDR_LEN); - } - else if (*p == FAC_NATIONAL_DIGIS) { + } else if (*p == FAC_NATIONAL_DIGIS) { if (l % AX25_ADDR_LEN) return -1; fac_national_digis_received = 1; |