net: enetc: declare NETIF_F_HW_CSUM and do it in software

This is just a preparation patch for software TSO in the enetc driver.
Unfortunately, ENETC does not support Tx checksum offload which would
normally render TSO, even software, impossible.

Declare NETIF_F_HW_CSUM as part of the feature set and do it at driver
level using skb_csum_hwoffload_help() so that we can move forward and
also add support for TSO in the next patch.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 3cbfa8b4e26536e106de41dfd1ddcf6a66376c90..17d8e04c10a82782d14e45a6a148ceaa7dbabb04 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -319,7 +319,7 @@ static netdev_tx_t enetc_start_xmit(struct sk_buff *skb,
 {
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
        struct enetc_bdr *tx_ring;
-       int count;
+       int count, err;
 
        /* Queue one-step Sync packet if already locked */
        if (skb->cb[0] & ENETC_F_TX_ONESTEP_SYNC_TSTAMP) {
@@ -342,6 +342,12 @@ static netdev_tx_t enetc_start_xmit(struct sk_buff *skb,
                return NETDEV_TX_BUSY;
        }
 
+       if (skb->ip_summed == CHECKSUM_PARTIAL) {
+               err = skb_checksum_help(skb);
+               if (err)
+                       goto drop_packet_err;
+       }
+
        enetc_lock_mdio();
        count = enetc_map_tx_buffs(tx_ring, skb);
        enetc_unlock_mdio();

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index 628a74ba630cfc4a8e4f8d0b04d44c02fe83f9d4..1e3b2e191562ffdf0f2e581503657a5af0f9fe9b 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -759,10 +759,12 @@ static void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
 
        ndev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM |
                            NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
-                           NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_LOOPBACK;
+                           NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_LOOPBACK |
+                           NETIF_F_HW_CSUM;
        ndev->features = NETIF_F_HIGHDMA | NETIF_F_SG | NETIF_F_RXCSUM |
                         NETIF_F_HW_VLAN_CTAG_TX |
-                        NETIF_F_HW_VLAN_CTAG_RX;
+                        NETIF_F_HW_VLAN_CTAG_RX |
+                        NETIF_F_HW_CSUM;
 
        if (si->num_rss)
                ndev->hw_features |= NETIF_F_RXHASH;

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_vf.c b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
index 0704f6bf12fde3ae8f3170c622392124cee17183..f2a0c0f9fe1d83160493f0d1959c8bff1e3febee 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_vf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
@@ -122,10 +122,12 @@ static void enetc_vf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
 
        ndev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM |
                            NETIF_F_HW_VLAN_CTAG_TX |
-                           NETIF_F_HW_VLAN_CTAG_RX;
+                           NETIF_F_HW_VLAN_CTAG_RX |
+                           NETIF_F_HW_CSUM;
        ndev->features = NETIF_F_HIGHDMA | NETIF_F_SG | NETIF_F_RXCSUM |
                         NETIF_F_HW_VLAN_CTAG_TX |
-                        NETIF_F_HW_VLAN_CTAG_RX;
+                        NETIF_F_HW_VLAN_CTAG_RX |
+                        NETIF_F_HW_CSUM;
 
        if (si->num_rss)
                ndev->hw_features |= NETIF_F_RXHASH;