sctp: Rename NETIF_F_SCTP_CSUM to NETIF_F_SCTP_CRC

BugLink: http://bugs.launchpad.net/bugs/1562326
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>
(cherry picked from commit 53692b1de419c1b59106909c7f6b4dd3dbc768ac)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index f72a2d4ea9f81383bb07321618e737f41f97ef6b..3ed6e12b85b4fdcd1072de4f944061462f52b2e7 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -9051,7 +9051,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
 
        netdev->features = NETIF_F_SG                  |
                           NETIF_F_IP_CSUM             |
-                          NETIF_F_SCTP_CSUM           |
+                          NETIF_F_SCTP_CRC            |
                           NETIF_F_HIGHDMA             |
                           NETIF_F_GSO_UDP_TUNNEL      |
                           NETIF_F_GSO_GRE             |

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 0e856e34a0281ebd107a9287ef953362a711fdb9..fe773441be1aadc3cdef3e4f9bc483a81d195c87 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2333,7 +2333,7 @@ int i40evf_process_config(struct i40evf_adapter *adapter)
        netdev->features |= NETIF_F_HIGHDMA |
                            NETIF_F_SG |
                            NETIF_F_IP_CSUM |
-                           NETIF_F_SCTP_CSUM |
+                           NETIF_F_SCTP_CRC |
                            NETIF_F_IPV6_CSUM |
                            NETIF_F_TSO |
                            NETIF_F_TSO6 |

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index a3cd562c0e58274c7d1c41172c8cc8835d57aae6..af46fcf8a50e014598a0443f10a719fe7f25f133 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2402,8 +2402,8 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
 
        if (hw->mac.type >= e1000_82576) {
-               netdev->hw_features |= NETIF_F_SCTP_CSUM;
-               netdev->features |= NETIF_F_SCTP_CSUM;
+               netdev->hw_features |= NETIF_F_SCTP_CRC;
+               netdev->features |= NETIF_F_SCTP_CRC;
        }
 
        netdev->priv_flags |= IFF_UNICAST_FLT;

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6cf31bdd55bb4f8fe7fca769ab64c501369a6d61..d5fdd0aeed5aafa0b6af5a21cdf754c87f9e463d 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -9028,8 +9028,8 @@ skip_sriov:
        case ixgbe_mac_X540:
        case ixgbe_mac_X550:
        case ixgbe_mac_X550EM_x:
-               netdev->features |= NETIF_F_SCTP_CSUM;
-               netdev->hw_features |= NETIF_F_SCTP_CSUM |
+               netdev->features |= NETIF_F_SCTP_CRC;
+               netdev->hw_features |= NETIF_F_SCTP_CRC |
                                       NETIF_F_NTUPLE;
                break;
        default:

diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index dc7d970bd1c0baaf1f707df87001da8f59f3d74a..a400288cb37b9bfb6190f1bd7c64d02e97713956 100644 (file)
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -175,7 +175,7 @@ static void loopback_setup(struct net_device *dev)
                | NETIF_F_UFO
                | NETIF_F_HW_CSUM
                | NETIF_F_RXCSUM
-               | NETIF_F_SCTP_CSUM
+               | NETIF_F_SCTP_CRC
                | NETIF_F_HIGHDMA
                | NETIF_F_LLTX
                | NETIF_F_NETNS_LOCAL

diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index 021cff9956a42d00631416a3ff0ae0e8e89b0e06..3773c5830944af32c514f169d42e7fc12a020797 100644 (file)
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -52,7 +52,7 @@ enum {
                NETIF_F_GSO_TUNNEL_REMCSUM_BIT,
 
        NETIF_F_FCOE_CRC_BIT,           /* FCoE CRC32 */
-       NETIF_F_SCTP_CSUM_BIT,          /* SCTP checksum offload */
+       NETIF_F_SCTP_CRC_BIT,           /* SCTP checksum offload */
        NETIF_F_FCOE_MTU_BIT,           /* Supports max FCoE MTU, 2158 bytes*/
        NETIF_F_NTUPLE_BIT,             /* N-tuple filters supported */
        NETIF_F_RXHASH_BIT,             /* Receive hashing offload */
@@ -105,7 +105,7 @@ enum {
 #define NETIF_F_NTUPLE         __NETIF_F(NTUPLE)
 #define NETIF_F_RXCSUM         __NETIF_F(RXCSUM)
 #define NETIF_F_RXHASH         __NETIF_F(RXHASH)
-#define NETIF_F_SCTP_CSUM      __NETIF_F(SCTP_CSUM)
+#define NETIF_F_SCTP_CRC       __NETIF_F(SCTP_CRC)
 #define NETIF_F_SG             __NETIF_F(SG)
 #define NETIF_F_TSO6           __NETIF_F(TSO6)
 #define NETIF_F_TSO_ECN                __NETIF_F(TSO_ECN)

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index fded86508117dad4d81aad327b287aee991a55be..c2bf37fa19cf455176c745ea2aaa30ffd2ea59dd 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -544,7 +544,7 @@ static int vlan_dev_init(struct net_device *dev)
 
        dev->hw_features = NETIF_F_ALL_CSUM | NETIF_F_SG |
                           NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE |
-                          NETIF_F_HIGHDMA | NETIF_F_SCTP_CSUM |
+                          NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC |
                           NETIF_F_ALL_FCOE;
 
        dev->features |= real_dev->vlan_features | NETIF_F_LLTX |

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 6fe932d5fe4a0e43aab4b8c782271e68f50a5fe8..623849e017dc495e2221bc1c3888f9f38491c467 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -87,7 +87,7 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN]
        [NETIF_F_GSO_UDP_TUNNEL_BIT] =   "tx-udp_tnl-segmentation",
 
        [NETIF_F_FCOE_CRC_BIT] =         "tx-checksum-fcoe-crc",
-       [NETIF_F_SCTP_CSUM_BIT] =        "tx-checksum-sctp",
+       [NETIF_F_SCTP_CRC_BIT] =        "tx-checksum-sctp",
        [NETIF_F_FCOE_MTU_BIT] =         "fcoe-mtu",
        [NETIF_F_NTUPLE_BIT] =           "rx-ntuple-filter",
        [NETIF_F_RXHASH_BIT] =           "rx-hashing",
@@ -236,7 +236,7 @@ static netdev_features_t ethtool_get_feature_mask(u32 eth_cmd)
        switch (eth_cmd) {
        case ETHTOOL_GTXCSUM:
        case ETHTOOL_STXCSUM:
-               return NETIF_F_ALL_CSUM | NETIF_F_SCTP_CSUM;
+               return NETIF_F_ALL_CSUM | NETIF_F_SCTP_CRC;
        case ETHTOOL_GRXCSUM:
        case ETHTOOL_SRXCSUM:
                return NETIF_F_RXCSUM;

diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c
index 010ddeec135f50950d2f9a356bc7211c351dde9a..d952d67f904d1124ed0c5adfa20a51f82207181c 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_proto_sctp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c
@@ -169,7 +169,7 @@ sctp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
        /* Only update csum if we really have to */
        if (sctph->dest != cp->dport || payload_csum ||
            (skb->ip_summed == CHECKSUM_PARTIAL &&
-            !(skb_dst(skb)->dev->features & NETIF_F_SCTP_CSUM))) {
+            !(skb_dst(skb)->dev->features & NETIF_F_SCTP_CRC))) {
                sctph->dest = cp->dport;
                sctp_nat_csum(skb, sctph, sctphoff);
        } else if (skb->ip_summed != CHECKSUM_PARTIAL) {

diff --git a/net/sctp/output.c b/net/sctp/output.c
index abe7c2db24120a13992131e2be9a19c70a297de0..9d610eddd19ef2320fc34ae9d91e7426ae5f50f9 100644 (file)
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -534,7 +534,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
         * by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>.
         */
        if (!sctp_checksum_disable) {
-               if (!(dst->dev->features & NETIF_F_SCTP_CSUM) ||
+               if (!(dst->dev->features & NETIF_F_SCTP_CRC) ||
                    (dst_xfrm(dst) != NULL) || packet->ipfragok) {
                        sh->checksum = sctp_compute_cksum(nskb, 0);
                } else {