summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorPavel Emelyanov2007-11-15 12:03:19 +0100
committerDavid S. Miller2008-01-28 23:54:00 +0100
commitc0ef877b2c9f543e9fb7953bfe1a0cd3a4eae362 (patch)
tree8e97df63b9e1b3cac8040461c263c0c938f8b994 /include/net
parent[NET]: Use sockfd_lookup_light in the rest of the net/socket.c (diff)
downloadkernel-qcow2-linux-c0ef877b2c9f543e9fb7953bfe1a0cd3a4eae362.tar.gz
kernel-qcow2-linux-c0ef877b2c9f543e9fb7953bfe1a0cd3a4eae362.tar.xz
kernel-qcow2-linux-c0ef877b2c9f543e9fb7953bfe1a0cd3a4eae362.zip
[NET]: 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 <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sock.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index f5b643714131..9c55af8e5f81 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1396,14 +1396,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;