Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b9d07a4 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

net: introduce keepalive function in struct proto 



Direct call of tcp_set_keepalive() function from protocol-agnostic
sock_setsockopt() function in net/core/sock.c violates network
layering. And newly introduced protocol (SMC-R) will need its own
keepalive function. Therefore, add "keepalive" function pointer
to "struct proto", and call it from sock_setsockopt() via this pointer.

Signed-off-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Reviewed-by: default avatarUtz Bacher <utz.bacher@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c8584b3f

include/net/sock.h

+1 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,7 @@ struct proto { 
	int			(*getsockopt)(struct sock *sk, int level,

					int optname, char __user *optval,

					int __user *option);

	void			(*keepalive)(struct sock *sk, int valbool);

#ifdef CONFIG_COMPAT

	int			(*compat_setsockopt)(struct sock *sk,

					int level,

net/core/sock.c

+2 −5
Original line number Diff line number Diff line
@@ -762,11 +762,8 @@ int sock_setsockopt(struct socket *sock, int level, int optname, 
		goto set_rcvbuf;



	case SO_KEEPALIVE:

#ifdef CONFIG_INET

		if (sk->sk_protocol == IPPROTO_TCP &&

		    sk->sk_type == SOCK_STREAM)

			tcp_set_keepalive(sk, valbool);

#endif

		if (sk->sk_prot->keepalive)

			sk->sk_prot->keepalive(sk, valbool);

		sock_valbool_flag(sk, SOCK_KEEPOPEN, valbool);

		break;

net/ipv4/tcp_ipv4.c

+1 −0
Original line number Diff line number Diff line
@@ -2376,6 +2376,7 @@ struct proto tcp_prot = { 
	.shutdown		= tcp_shutdown,

	.setsockopt		= tcp_setsockopt,

	.getsockopt		= tcp_getsockopt,

	.keepalive		= tcp_set_keepalive,

	.recvmsg		= tcp_recvmsg,

	.sendmsg		= tcp_sendmsg,

	.sendpage		= tcp_sendpage,

net/ipv4/tcp_timer.c

+1 −0
Original line number Diff line number Diff line
@@ -617,6 +617,7 @@ void tcp_set_keepalive(struct sock *sk, int val) 
	else if (!val)

		inet_csk_delete_keepalive_timer(sk);

}

EXPORT_SYMBOL_GPL(tcp_set_keepalive);





static void tcp_keepalive_timer (unsigned long data)

net/ipv6/tcp_ipv6.c

+1 −0
Original line number Diff line number Diff line
@@ -1889,6 +1889,7 @@ struct proto tcpv6_prot = { 
	.shutdown		= tcp_shutdown,

	.setsockopt		= tcp_setsockopt,

	.getsockopt		= tcp_getsockopt,

	.keepalive		= tcp_set_keepalive,

	.recvmsg		= tcp_recvmsg,

	.sendmsg		= tcp_sendmsg,

	.sendpage		= tcp_sendpage,