]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: ixgbevf: use skb_csum_is_sctp instead of protocol check
authorXin Long <lucien.xin@gmail.com>
Sat, 16 Jan 2021 06:13:42 +0000 (14:13 +0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 19 Jan 2021 22:31:26 +0000 (14:31 -0800)
Using skb_csum_is_sctp is a easier way to validate it's a SCTP CRC
checksum offload packet, and yet it also makes ixgbevf support SCTP
CRC checksum offload for UDP and GRE encapped packets, just as it
does in igb driver.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

index a534a3fb392edc82c9fb5506f6e2fde32407f1ff..a14e55e7fce88c506694212ea90904e39395d5c9 100644 (file)
@@ -3843,15 +3843,6 @@ static int ixgbevf_tso(struct ixgbevf_ring *tx_ring,
        return 1;
 }
 
-static inline bool ixgbevf_ipv6_csum_is_sctp(struct sk_buff *skb)
-{
-       unsigned int offset = 0;
-
-       ipv6_find_hdr(skb, &offset, IPPROTO_SCTP, NULL, NULL);
-
-       return offset == skb_checksum_start_offset(skb);
-}
-
 static void ixgbevf_tx_csum(struct ixgbevf_ring *tx_ring,
                            struct ixgbevf_tx_buffer *first,
                            struct ixgbevf_ipsec_tx_data *itd)
@@ -3872,10 +3863,7 @@ static void ixgbevf_tx_csum(struct ixgbevf_ring *tx_ring,
                break;
        case offsetof(struct sctphdr, checksum):
                /* validate that this is actually an SCTP request */
-               if (((first->protocol == htons(ETH_P_IP)) &&
-                    (ip_hdr(skb)->protocol == IPPROTO_SCTP)) ||
-                   ((first->protocol == htons(ETH_P_IPV6)) &&
-                    ixgbevf_ipv6_csum_is_sctp(skb))) {
+               if (skb_csum_is_sctp(skb)) {
                        type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_SCTP;
                        break;
                }