Commit acede3c5 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by David S. Miller
Browse files

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: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36ee7281

drivers/net/ethernet/freescale/enetc/enetc.c

+7 −1
Original line number Diff line number Diff line
@@ -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();

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/freescale/enetc/enetc_vf.c

+4 −2
Original line number Diff line number Diff line
@@ -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;