Skip to contentSkip to conversation

Move sock_valbool_flag to socket.c

PATCH Applied Pavel Emelyanov 2 participants 2 messages Nov 15, 2007

Subsystems (3)
Networking Network drivers Sockets
lore
Share & tools
lore

Pavel Emelyanov

author
#0 lore raw

PATCH 1/1 Move sock_valbool_flag to socket.c

The sock_valbool_flag() helper is used in setsockopt to set or reset some flag on the sock. This helper is required in the net/socket.c only, so move it there.

Besides, patch two places in sys_setsockopt() that repeat this helper functionality manually.

Since this is not a bugfix, but a trivial cleanup, I prepared this patch against net-2.6.25, but it also applies (with a single offset) to the latest net-2.6.

Signed-off-by Pavel Emelyanov <[email protected]>

---

include/net/sock.h +0 -8
index cfb946a..80ca671 100644
@@ -1393,14 +1393,6 @@ extern int net_msg_warn;
 				lock_sock(sk); \
 				}
 
-static inline void sock_valbool_flag(struct sock *sk, int bit, int valbool)
-{
-	if (valbool)
-		sock_set_flag(sk, bit);
-	else
-		sock_reset_flag(sk, bit);
-}
-
 extern __u32 sysctl_wmem_max;
 extern __u32 sysctl_rmem_max;
net/core/sock.c +11 -9
index 2029d09..98b243a 100644
@@ -419,6 +419,14 @@ out:
 	return ret;
 }
 
+static inline void sock_valbool_flag(struct sock *sk, int bit, int valbool)
+{
+	if (valbool)
+		sock_set_flag(sk, bit);
+	else
+		sock_reset_flag(sk, bit);
+}
+
 /*
  *	This is meant for all protocols to use and covers goings on
  *	at the socket level. Everything here is generic.

@@ -463,11 +471,8 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 	case SO_DEBUG:
 		if (val && !capable(CAP_NET_ADMIN)) {
 			ret = -EACCES;
-		}
-		else if (valbool)
-			sock_set_flag(sk, SOCK_DBG);
-		else
-			sock_reset_flag(sk, SOCK_DBG);
+		} else
+			sock_valbool_flag(sk, SOCK_DBG, valbool);
 		break;
 	case SO_REUSEADDR:
 		sk->sk_reuse = valbool;

@@ -477,10 +482,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 		ret = -ENOPROTOOPT;
 		break;
 	case SO_DONTROUTE:
-		if (valbool)
-			sock_set_flag(sk, SOCK_LOCALROUTE);
-		else
-			sock_reset_flag(sk, SOCK_LOCALROUTE);
+		sock_valbool_flag(sk, SOCK_LOCALROUTE, valbool);
 		break;
 	case SO_BROADCAST:
 		sock_valbool_flag(sk, SOCK_BROADCAST, valbool);
maintainer Applied
#1 lore raw

From: Pavel Emelyanov <[email protected]>
Date: Thu, 15 Nov 2007 12:43:51 +0300

Quoted 4 lines

The sock_valbool_flag() helper is used in setsockopt to set or reset some flag on the sock. This helper is required in the net/socket.c only, so move it there.

Quoted 8 lines

Besides, patch two places in sys_setsockopt() that repeat this helper functionality manually.

Since this is not a bugfix, but a trivial cleanup, I prepared this patch against net-2.6.25, but it also applies (with a single offset) to the latest net-2.6.

Signed-off-by Pavel Emelyanov <[email protected]>

Applied to net-2.6.25, thanks Pavel.