UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2021-11-15 11:02:33 -08:00 committed by David S. Miller
parent 3735440200
commit 42f67eea3b
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/skmsg.h
View File

@ -507,12 +507,6 @@ static inline bool sk_psock_strp_enabled(struct sk_psock *psock)
return !!psock->saved_data_ready; 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) static inline bool sk_is_udp(const struct sock *sk)
{ {
return sk->sk_type == SOCK_DGRAM && return sk->sk_type == SOCK_DGRAM &&

5
include/net/sock.h
View File

@ -2638,6 +2638,11 @@ static inline void skb_setup_tx_timestamp(struct sk_buff *skb, __u16 tsflags)
&skb_shinfo(skb)->tskey); &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_eat_skb - Release a skb if it is no longer needed
* @sk: socket to eat this skb from * @sk: socket to eat this skb from

6
net/core/skbuff.c
View File

@ -4849,8 +4849,7 @@ static void __skb_complete_tx_timestamp(struct sk_buff *skb,
serr->header.h4.iif = skb->dev ? skb->dev->ifindex : 0; serr->header.h4.iif = skb->dev ? skb->dev->ifindex : 0;
if (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID) { if (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID) {
serr->ee.ee_data = skb_shinfo(skb)->tskey; serr->ee.ee_data = skb_shinfo(skb)->tskey;
if (sk->sk_protocol == IPPROTO_TCP && if (sk_is_tcp(sk))
sk->sk_type == SOCK_STREAM)
serr->ee.ee_data -= sk->sk_tskey; serr->ee.ee_data -= sk->sk_tskey;
} }
@ -4919,8 +4918,7 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb,
if (tsonly) { if (tsonly) {
#ifdef CONFIG_INET #ifdef CONFIG_INET
if ((sk->sk_tsflags & SOF_TIMESTAMPING_OPT_STATS) && if ((sk->sk_tsflags & SOF_TIMESTAMPING_OPT_STATS) &&
sk->sk_protocol == IPPROTO_TCP && sk_is_tcp(sk)) {
sk->sk_type == SOCK_STREAM) {
skb = tcp_get_timestamping_opt_stats(sk, orig_skb, skb = tcp_get_timestamping_opt_stats(sk, orig_skb,
ack_skb); ack_skb);
opt_stats = true; opt_stats = true;

6
net/core/sock.c
View File

@ -872,8 +872,7 @@ int sock_set_timestamping(struct sock *sk, int optname,
if (val & SOF_TIMESTAMPING_OPT_ID && if (val & SOF_TIMESTAMPING_OPT_ID &&
!(sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID)) { !(sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID)) {
if (sk->sk_protocol == IPPROTO_TCP && if (sk_is_tcp(sk)) {
sk->sk_type == SOCK_STREAM) {
if ((1 << sk->sk_state) & if ((1 << sk->sk_state) &
(TCPF_CLOSE | TCPF_LISTEN)) (TCPF_CLOSE | TCPF_LISTEN))
return -EINVAL; return -EINVAL;
@ -1370,8 +1369,7 @@ set_sndbuf:
case SO_ZEROCOPY: case SO_ZEROCOPY:
if (sk->sk_family == PF_INET || sk->sk_family == PF_INET6) { if (sk->sk_family == PF_INET || sk->sk_family == PF_INET6) {
if (!((sk->sk_type == SOCK_STREAM && if (!(sk_is_tcp(sk) ||
sk->sk_protocol == IPPROTO_TCP) ||
(sk->sk_type == SOCK_DGRAM && (sk->sk_type == SOCK_DGRAM &&
sk->sk_protocol == IPPROTO_UDP))) sk->sk_protocol == IPPROTO_UDP)))
ret = -ENOTSUPP; ret = -ENOTSUPP;