Commit c383b537 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Allow for additional checksum offload features 



Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76884835

drivers/net/sfc/efx.c

+1 −1
Original line number Diff line number Diff line
@@ -2179,7 +2179,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev, 
	net_dev = alloc_etherdev(sizeof(*efx));

	if (!net_dev)

		return -ENOMEM;

	net_dev->features |= (NETIF_F_IP_CSUM | NETIF_F_SG |

	net_dev->features |= (type->offload_features | NETIF_F_SG |

			      NETIF_F_HIGHDMA | NETIF_F_TSO |

			      NETIF_F_GRO);

	/* Mask for features that also apply to VLAN devices */

drivers/net/sfc/ethtool.c

+15 −1
Original line number Diff line number Diff line
@@ -468,6 +468,19 @@ static void efx_ethtool_get_stats(struct net_device *net_dev, 
	}

}



static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable)

{

	struct efx_nic *efx = netdev_priv(net_dev);

	unsigned long features = efx->type->offload_features & NETIF_F_ALL_CSUM;



	if (enable)

		net_dev->features |= features;

	else

		net_dev->features &= ~features;



	return 0;

}



static int efx_ethtool_set_rx_csum(struct net_device *net_dev, u32 enable)

{

	struct efx_nic *efx = netdev_priv(net_dev);
@@ -813,7 +826,8 @@ const struct ethtool_ops efx_ethtool_ops = { 
	.get_rx_csum		= efx_ethtool_get_rx_csum,

	.set_rx_csum		= efx_ethtool_set_rx_csum,

	.get_tx_csum		= ethtool_op_get_tx_csum,

	.set_tx_csum		= ethtool_op_set_tx_csum,

	/* Need to enable/disable IPv6 too */

	.set_tx_csum		= efx_ethtool_set_tx_csum,

	.get_sg			= ethtool_op_get_sg,

	.set_sg			= ethtool_op_set_sg,

	.get_tso		= ethtool_op_get_tso,

drivers/net/sfc/falcon.c

+2 −0
Original line number Diff line number Diff line
@@ -3304,6 +3304,7 @@ struct efx_nic_type falcon_a1_nic_type = { 
	.phys_addr_channels = 4,

	.tx_dc_base = 0x130000,

	.rx_dc_base = 0x100000,

	.offload_features = NETIF_F_IP_CSUM,

	.reset_world_flags = ETH_RESET_IRQ,

};
@@ -3351,6 +3352,7 @@ struct efx_nic_type falcon_b0_nic_type = { 
				   * channels */

	.tx_dc_base = 0x130000,

	.rx_dc_base = 0x100000,

	.offload_features = NETIF_F_IP_CSUM,

	.reset_world_flags = ETH_RESET_IRQ,

};

drivers/net/sfc/net_driver.h

+3 −0
Original line number Diff line number Diff line
@@ -864,6 +864,8 @@ static inline const char *efx_dev_name(struct efx_nic *efx) 
 *	descriptors

 * @tx_dc_base: Base address in SRAM of TX queue descriptor caches

 * @rx_dc_base: Base address in SRAM of RX queue descriptor caches

 * @offload_features: net_device feature flags for protocol offload

 *	features implemented in hardware

 * @reset_world_flags: Flags for additional components covered by

 *	reset method RESET_TYPE_WORLD

 */
@@ -904,6 +906,7 @@ struct efx_nic_type { 
	unsigned int phys_addr_channels;

	unsigned int tx_dc_base;

	unsigned int rx_dc_base;

	unsigned long offload_features;

	u32 reset_world_flags;

};