Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6460d948 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[NET]: Add ethtool support for NETIF_F_IPV6_CSUM devices. 



Add ethtool utility function to set or clear IPV6_CSUM feature flag.
Modify tg3.c and bnx2.c to use this function when doing ethtool -K
to change tx checksum.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent febca281

drivers/net/bnx2.c

+1 −1
Original line number Diff line number Diff line
@@ -6218,7 +6218,7 @@ bnx2_set_tx_csum(struct net_device *dev, u32 data) 
	struct bnx2 *bp = netdev_priv(dev);



	if (CHIP_NUM(bp) == CHIP_NUM_5709)

		return (ethtool_op_set_tx_hw_csum(dev, data));

		return (ethtool_op_set_tx_ipv6_csum(dev, data));

	else

		return (ethtool_op_set_tx_csum(dev, data));

}

drivers/net/tg3.c

+1 −1
Original line number Diff line number Diff line
@@ -8318,7 +8318,7 @@ static int tg3_set_tx_csum(struct net_device *dev, u32 data) 


	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787)

		ethtool_op_set_tx_hw_csum(dev, data);

		ethtool_op_set_tx_ipv6_csum(dev, data);

	else

		ethtool_op_set_tx_csum(dev, data);

include/linux/ethtool.h

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ u32 ethtool_op_get_link(struct net_device *dev); 
u32 ethtool_op_get_tx_csum(struct net_device *dev);

int ethtool_op_set_tx_csum(struct net_device *dev, u32 data);

int ethtool_op_set_tx_hw_csum(struct net_device *dev, u32 data);

int ethtool_op_set_tx_ipv6_csum(struct net_device *dev, u32 data);

u32 ethtool_op_get_sg(struct net_device *dev);

int ethtool_op_set_sg(struct net_device *dev, u32 data);

u32 ethtool_op_get_tso(struct net_device *dev);

net/core/ethtool.c

+12 −0
Original line number Diff line number Diff line
@@ -52,6 +52,17 @@ int ethtool_op_set_tx_hw_csum(struct net_device *dev, u32 data) 


	return 0;

}



int ethtool_op_set_tx_ipv6_csum(struct net_device *dev, u32 data)

{

	if (data)

		dev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;

	else

		dev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);



	return 0;

}



u32 ethtool_op_get_sg(struct net_device *dev)

{

	return (dev->features & NETIF_F_SG) != 0;
@@ -980,5 +991,6 @@ EXPORT_SYMBOL(ethtool_op_set_sg); 
EXPORT_SYMBOL(ethtool_op_set_tso);

EXPORT_SYMBOL(ethtool_op_set_tx_csum);

EXPORT_SYMBOL(ethtool_op_set_tx_hw_csum);

EXPORT_SYMBOL(ethtool_op_set_tx_ipv6_csum);

EXPORT_SYMBOL(ethtool_op_set_ufo);

EXPORT_SYMBOL(ethtool_op_get_ufo);