| Message ID | 20220317032308.65372-1-kuniyu@amazon.co.jp (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4edf21aa94ee33c75f819f2b6eb6dd52ef8a1628 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] af_unix: Remove unnecessary brackets around CONFIG_AF_UNIX_OOB. | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 17 Mar 2022 12:23:08 +0900 you wrote: > Let's remove unnecessary brackets around CONFIG_AF_UNIX_OOB. > > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp> > --- > This is a follow up patch from > https://lore.kernel.org/netdev/20220316194614.3e38cadc@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com/#t > > [...] Here is the summary with links: - [net-next] af_unix: Remove unnecessary brackets around CONFIG_AF_UNIX_OOB. https://git.kernel.org/netdev/net-next/c/4edf21aa94ee You are awesome, thank you!
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 3e0d6281fd1e..4247c4134f31 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2049,7 +2049,7 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, */ #define UNIX_SKB_FRAGS_SZ (PAGE_SIZE << get_order(32768)) -#if (IS_ENABLED(CONFIG_AF_UNIX_OOB)) +#if IS_ENABLED(CONFIG_AF_UNIX_OOB) static int queue_oob(struct socket *sock, struct msghdr *msg, struct sock *other) { struct unix_sock *ousk = unix_sk(other); @@ -2115,7 +2115,7 @@ static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg, err = -EOPNOTSUPP; if (msg->msg_flags & MSG_OOB) { -#if (IS_ENABLED(CONFIG_AF_UNIX_OOB)) +#if IS_ENABLED(CONFIG_AF_UNIX_OOB) if (len) len--; else @@ -2186,7 +2186,7 @@ static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg, sent += size; } -#if (IS_ENABLED(CONFIG_AF_UNIX_OOB)) +#if IS_ENABLED(CONFIG_AF_UNIX_OOB) if (msg->msg_flags & MSG_OOB) { err = queue_oob(sock, msg, other); if (err)
Let's remove unnecessary brackets around CONFIG_AF_UNIX_OOB. Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp> --- This is a follow up patch from https://lore.kernel.org/netdev/20220316194614.3e38cadc@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com/#t --- net/unix/af_unix.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)