lkml.org 
[lkml]   [2023]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/4] nfc: llcp_sock_sendmsg: Reformat code to make the smaller block indented
Date
The block for datagram sending is a significantly bigger chunk of the
function compared to the other scenario.

Thus, put the significantly smaller block inside the if-block.

Signed-off-by: Siddh Raman Pant <code@siddh.me>
---
net/nfc/llcp_sock.c | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index 603f2219b62f..3f1a39e54aa1 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -795,34 +795,32 @@ static int llcp_sock_sendmsg(struct socket *sock, struct msghdr *msg,
return -ENODEV;
}

- if (sk->sk_type == SOCK_DGRAM) {
- if (sk->sk_state != LLCP_BOUND) {
- release_sock(sk);
- return -ENOTCONN;
- }
+ if (sk->sk_type != SOCK_DGRAM) {
+ release_sock(sk);

- DECLARE_SOCKADDR(struct sockaddr_nfc_llcp *, addr,
- msg->msg_name);
+ if (sk->sk_state != LLCP_CONNECTED)
+ return -ENOTCONN;

- if (msg->msg_namelen < sizeof(*addr)) {
- release_sock(sk);
- return -EINVAL;
- }
+ return nfc_llcp_send_i_frame(llcp_sock, msg, len);
+ }

+ if (sk->sk_state != LLCP_BOUND) {
release_sock(sk);
-
- return nfc_llcp_send_ui_frame(llcp_sock, addr->dsap, addr->ssap,
- msg, len);
+ return -ENOTCONN;
}

- if (sk->sk_state != LLCP_CONNECTED) {
+ DECLARE_SOCKADDR(struct sockaddr_nfc_llcp *, addr, msg->msg_name);
+
+ if (msg->msg_namelen < sizeof(*addr)) {
release_sock(sk);
- return -ENOTCONN;
+ return -EINVAL;
}

release_sock(sk);

- return nfc_llcp_send_i_frame(llcp_sock, msg, len);
+ return nfc_llcp_send_ui_frame(llcp_sock, addr->dsap, addr->ssap,
+ msg, len);
+
}

static int llcp_sock_recvmsg(struct socket *sock, struct msghdr *msg,
--
2.42.0
\
 
 \ /
  Last update: 2023-11-25 21:27    [W:0.109 / U:0.592 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site