Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sctp: Rename NETIF_F_SCTP_CSUM to NETIF_F_SCTP_CRC

The SCTP checksum is really a CRC and is very different from the
standards 1's complement checksum that serves as the checksum
for IP protocols. This offload interface is also very different.
Rename NETIF_F_SCTP_CSUM to NETIF_F_SCTP_CRC to highlight these
differences. The term CSUM should be reserved in the stack to refer
to the standard 1's complement IP checksum.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Tom Herbert and committed by
David S. Miller
53692b1d 55dc5a9f

+14 -14
+1 -1
drivers/net/ethernet/intel/i40e/i40e_main.c
··· 8842 8842 8843 8843 netdev->features = NETIF_F_SG | 8844 8844 NETIF_F_IP_CSUM | 8845 - NETIF_F_SCTP_CSUM | 8845 + NETIF_F_SCTP_CRC | 8846 8846 NETIF_F_HIGHDMA | 8847 8847 NETIF_F_GSO_UDP_TUNNEL | 8848 8848 NETIF_F_GSO_GRE |
+1 -1
drivers/net/ethernet/intel/i40evf/i40evf_main.c
··· 2321 2321 netdev->features |= NETIF_F_HIGHDMA | 2322 2322 NETIF_F_SG | 2323 2323 NETIF_F_IP_CSUM | 2324 - NETIF_F_SCTP_CSUM | 2324 + NETIF_F_SCTP_CRC | 2325 2325 NETIF_F_IPV6_CSUM | 2326 2326 NETIF_F_TSO | 2327 2327 NETIF_F_TSO6 |
+2 -2
drivers/net/ethernet/intel/igb/igb_main.c
··· 2379 2379 } 2380 2380 2381 2381 if (hw->mac.type >= e1000_82576) { 2382 - netdev->hw_features |= NETIF_F_SCTP_CSUM; 2383 - netdev->features |= NETIF_F_SCTP_CSUM; 2382 + netdev->hw_features |= NETIF_F_SCTP_CRC; 2383 + netdev->features |= NETIF_F_SCTP_CRC; 2384 2384 } 2385 2385 2386 2386 netdev->priv_flags |= IFF_UNICAST_FLT;
+2 -2
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
··· 8995 8995 case ixgbe_mac_X540: 8996 8996 case ixgbe_mac_X550: 8997 8997 case ixgbe_mac_X550EM_x: 8998 - netdev->features |= NETIF_F_SCTP_CSUM; 8999 - netdev->hw_features |= NETIF_F_SCTP_CSUM | 8998 + netdev->features |= NETIF_F_SCTP_CRC; 8999 + netdev->hw_features |= NETIF_F_SCTP_CRC | 9000 9000 NETIF_F_NTUPLE; 9001 9001 break; 9002 9002 default:
+1 -1
drivers/net/loopback.c
··· 175 175 | NETIF_F_UFO 176 176 | NETIF_F_HW_CSUM 177 177 | NETIF_F_RXCSUM 178 - | NETIF_F_SCTP_CSUM 178 + | NETIF_F_SCTP_CRC 179 179 | NETIF_F_HIGHDMA 180 180 | NETIF_F_LLTX 181 181 | NETIF_F_NETNS_LOCAL
+2 -2
include/linux/netdev_features.h
··· 52 52 NETIF_F_GSO_TUNNEL_REMCSUM_BIT, 53 53 54 54 NETIF_F_FCOE_CRC_BIT, /* FCoE CRC32 */ 55 - NETIF_F_SCTP_CSUM_BIT, /* SCTP checksum offload */ 55 + NETIF_F_SCTP_CRC_BIT, /* SCTP checksum offload */ 56 56 NETIF_F_FCOE_MTU_BIT, /* Supports max FCoE MTU, 2158 bytes*/ 57 57 NETIF_F_NTUPLE_BIT, /* N-tuple filters supported */ 58 58 NETIF_F_RXHASH_BIT, /* Receive hashing offload */ ··· 103 103 #define NETIF_F_NTUPLE __NETIF_F(NTUPLE) 104 104 #define NETIF_F_RXCSUM __NETIF_F(RXCSUM) 105 105 #define NETIF_F_RXHASH __NETIF_F(RXHASH) 106 - #define NETIF_F_SCTP_CSUM __NETIF_F(SCTP_CSUM) 106 + #define NETIF_F_SCTP_CRC __NETIF_F(SCTP_CRC) 107 107 #define NETIF_F_SG __NETIF_F(SG) 108 108 #define NETIF_F_TSO6 __NETIF_F(TSO6) 109 109 #define NETIF_F_TSO_ECN __NETIF_F(TSO_ECN)
+1 -1
net/8021q/vlan_dev.c
··· 545 545 546 546 dev->hw_features = NETIF_F_ALL_CSUM | NETIF_F_SG | 547 547 NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE | 548 - NETIF_F_HIGHDMA | NETIF_F_SCTP_CSUM | 548 + NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC | 549 549 NETIF_F_ALL_FCOE; 550 550 551 551 dev->features |= real_dev->vlan_features | NETIF_F_LLTX |
+2 -2
net/core/ethtool.c
··· 87 87 [NETIF_F_GSO_UDP_TUNNEL_BIT] = "tx-udp_tnl-segmentation", 88 88 89 89 [NETIF_F_FCOE_CRC_BIT] = "tx-checksum-fcoe-crc", 90 - [NETIF_F_SCTP_CSUM_BIT] = "tx-checksum-sctp", 90 + [NETIF_F_SCTP_CRC_BIT] = "tx-checksum-sctp", 91 91 [NETIF_F_FCOE_MTU_BIT] = "fcoe-mtu", 92 92 [NETIF_F_NTUPLE_BIT] = "rx-ntuple-filter", 93 93 [NETIF_F_RXHASH_BIT] = "rx-hashing", ··· 235 235 switch (eth_cmd) { 236 236 case ETHTOOL_GTXCSUM: 237 237 case ETHTOOL_STXCSUM: 238 - return NETIF_F_ALL_CSUM | NETIF_F_SCTP_CSUM; 238 + return NETIF_F_ALL_CSUM | NETIF_F_SCTP_CRC; 239 239 case ETHTOOL_GRXCSUM: 240 240 case ETHTOOL_SRXCSUM: 241 241 return NETIF_F_RXCSUM;
+1 -1
net/netfilter/ipvs/ip_vs_proto_sctp.c
··· 169 169 /* Only update csum if we really have to */ 170 170 if (sctph->dest != cp->dport || payload_csum || 171 171 (skb->ip_summed == CHECKSUM_PARTIAL && 172 - !(skb_dst(skb)->dev->features & NETIF_F_SCTP_CSUM))) { 172 + !(skb_dst(skb)->dev->features & NETIF_F_SCTP_CRC))) { 173 173 sctph->dest = cp->dport; 174 174 sctp_nat_csum(skb, sctph, sctphoff); 175 175 } else if (skb->ip_summed != CHECKSUM_PARTIAL) {
+1 -1
net/sctp/output.c
··· 534 534 * by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>. 535 535 */ 536 536 if (!sctp_checksum_disable) { 537 - if (!(dst->dev->features & NETIF_F_SCTP_CSUM) || 537 + if (!(dst->dev->features & NETIF_F_SCTP_CRC) || 538 538 (dst_xfrm(dst) != NULL) || packet->ipfragok) { 539 539 sh->checksum = sctp_compute_cksum(nskb, 0); 540 540 } else {