Commit 42f67eea authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: use sk_is_tcp() in more places 



Move sk_is_tcp() to include/net/sock.h and use it where we can.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 37354402

include/linux/skmsg.h

+0 −6
Original line number Diff line number Diff line
@@ -507,12 +507,6 @@ static inline bool sk_psock_strp_enabled(struct sk_psock *psock) 
	return !!psock->saved_data_ready;

}



static inline bool sk_is_tcp(const struct sock *sk)

{

	return sk->sk_type == SOCK_STREAM &&

	       sk->sk_protocol == IPPROTO_TCP;

}



static inline bool sk_is_udp(const struct sock *sk)

{

	return sk->sk_type == SOCK_DGRAM &&

include/net/sock.h

+5 −0
Original line number Diff line number Diff line
@@ -2638,6 +2638,11 @@ static inline void skb_setup_tx_timestamp(struct sk_buff *skb, __u16 tsflags) 
			   &skb_shinfo(skb)->tskey);

}



static inline bool sk_is_tcp(const struct sock *sk)

{

	return sk->sk_type == SOCK_STREAM && sk->sk_protocol == IPPROTO_TCP;

}



/**

 * sk_eat_skb - Release a skb if it is no longer needed

 * @sk: socket to eat this skb from

net/core/skbuff.c

+2 −4
Original line number Diff line number Diff line
@@ -4849,8 +4849,7 @@ static void __skb_complete_tx_timestamp(struct sk_buff *skb, 
	serr->header.h4.iif = skb->dev ? skb->dev->ifindex : 0;

	if (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID) {

		serr->ee.ee_data = skb_shinfo(skb)->tskey;

		if (sk->sk_protocol == IPPROTO_TCP &&

		    sk->sk_type == SOCK_STREAM)

		if (sk_is_tcp(sk))

			serr->ee.ee_data -= sk->sk_tskey;

	}
@@ -4919,8 +4918,7 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb, 
	if (tsonly) {

#ifdef CONFIG_INET

		if ((sk->sk_tsflags & SOF_TIMESTAMPING_OPT_STATS) &&

		    sk->sk_protocol == IPPROTO_TCP &&

		    sk->sk_type == SOCK_STREAM) {

		    sk_is_tcp(sk)) {

			skb = tcp_get_timestamping_opt_stats(sk, orig_skb,

							     ack_skb);

			opt_stats = true;

net/core/sock.c

+2 −4
Original line number Diff line number Diff line
@@ -872,8 +872,7 @@ int sock_set_timestamping(struct sock *sk, int optname, 


	if (val & SOF_TIMESTAMPING_OPT_ID &&

	    !(sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID)) {

		if (sk->sk_protocol == IPPROTO_TCP &&

		    sk->sk_type == SOCK_STREAM) {

		if (sk_is_tcp(sk)) {

			if ((1 << sk->sk_state) &

			    (TCPF_CLOSE | TCPF_LISTEN))

				return -EINVAL;
@@ -1370,8 +1369,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname, 


	case SO_ZEROCOPY:

		if (sk->sk_family == PF_INET || sk->sk_family == PF_INET6) {

			if (!((sk->sk_type == SOCK_STREAM &&

			       sk->sk_protocol == IPPROTO_TCP) ||

			if (!(sk_is_tcp(sk) ||

			      (sk->sk_type == SOCK_DGRAM &&

			       sk->sk_protocol == IPPROTO_UDP)))

				ret = -ENOTSUPP;