net: skbuff: hide csum_not_inet when CONFIG_IP_SCTP not set

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>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 513f03b23a73925a5438fb355751d338f0953cf5..98d6b48f4dcf6346ea627b311e0487ecdc511368 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -983,7 +983,9 @@ struct sk_buff {
        __u8                    decrypted:1;
 #endif
        __u8                    slow_gro:1;
+#if IS_ENABLED(CONFIG_IP_SCTP)
        __u8                    csum_not_inet:1;
+#endif
 
 #ifdef CONFIG_NET_SCHED
        __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)
 {
+#if IS_ENABLED(CONFIG_IP_SCTP)
        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,

diff --git a/net/core/dev.c b/net/core/dev.c
index 8aea68275172c98cea48ae8cf9a25d7f53b0d9b8..3fc4dba71f9dd250c59c0a070566791f0cd27ec4 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3315,8 +3315,7 @@ int skb_crc32c_csum_help(struct sk_buff *skb)
                                                  skb->len - start, ~(__u32)0,
                                                  crc32c_csum_stub));
        *(__le32 *)(skb->data + offset) = crc32c_csum;
-       skb->ip_summed = CHECKSUM_NONE;
-       skb->csum_not_inet = 0;
+       skb_reset_csum_not_inet(skb);
 out:
        return ret;
 }

diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 95e9304024b7db3902a16bccaee8a18ee937e9a9..8ed285023a40a8009c212a8832e61bff7fe377c7 100644 (file)
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -376,8 +376,7 @@ static int tcf_csum_sctp(struct sk_buff *skb, unsigned int ihl,
 
        sctph->checksum = sctp_compute_cksum(skb,
                                             skb_network_offset(skb) + ihl);
-       skb->ip_summed = CHECKSUM_NONE;
-       skb->csum_not_inet = 0;
+       skb_reset_csum_not_inet(skb);
 
        return 1;
 }