korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-23 20:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: skbuff: hide csum_not_inet when CONFIG_IP_SCTP not set

Browse Source 
SCTP is not universally deployed, allow hiding its bit
from the skb.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2023-04-17 08:53:47 -07:00 committed by David S. Miller
parent eb6fba7555
commit c24831a13b
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/linux/skbuff.h
View File

@ -983,7 +983,9 @@ struct sk_buff {
__u8 decrypted:1; __u8 decrypted:1;
#endif #endif
__u8 slow_gro:1; __u8 slow_gro:1;
#if IS_ENABLED(CONFIG_IP_SCTP)
__u8 csum_not_inet:1; __u8 csum_not_inet:1;
#endif
#ifdef CONFIG_NET_SCHED #ifdef CONFIG_NET_SCHED
__u16 tc_index; /* traffic control index */ __u16 tc_index; /* traffic control index */
@ -5060,7 +5062,19 @@ static inline void skb_reset_redirect(struct sk_buff *skb)
static inline bool skb_csum_is_sctp(struct sk_buff *skb) static inline bool skb_csum_is_sctp(struct sk_buff *skb)
{ {
#if IS_ENABLED(CONFIG_IP_SCTP)
return skb->csum_not_inet; return skb->csum_not_inet;
#else
return 0;
#endif
}
static inline void skb_reset_csum_not_inet(struct sk_buff *skb)
{
skb->ip_summed = CHECKSUM_NONE;
#if IS_ENABLED(CONFIG_IP_SCTP)
skb->csum_not_inet = 0;
#endif
} }
static inline void skb_set_kcov_handle(struct sk_buff *skb, static inline void skb_set_kcov_handle(struct sk_buff *skb,

3
net/core/dev.c
View File

@ -3315,8 +3315,7 @@ int skb_crc32c_csum_help(struct sk_buff *skb)
skb->len - start, ~(__u32)0, skb->len - start, ~(__u32)0,
crc32c_csum_stub)); crc32c_csum_stub));
*(__le32 *)(skb->data + offset) = crc32c_csum; *(__le32 *)(skb->data + offset) = crc32c_csum;
skb->ip_summed = CHECKSUM_NONE; skb_reset_csum_not_inet(skb);
skb->csum_not_inet = 0;
out: out:
return ret; return ret;
} }

3
net/sched/act_csum.c
View File

@ -376,8 +376,7 @@ static int tcf_csum_sctp(struct sk_buff *skb, unsigned int ihl,
sctph->checksum = sctp_compute_cksum(skb, sctph->checksum = sctp_compute_cksum(skb,
skb_network_offset(skb) + ihl); skb_network_offset(skb) + ihl);
skb->ip_summed = CHECKSUM_NONE; skb_reset_csum_not_inet(skb);
skb->csum_not_inet = 0;
return 1; return 1;
} }