aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sc92031.c
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2010-11-30 01:38:00 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-06 15:59:04 -0500
commit7903264402546f45f9bac8ad2bfdb00d00eb124a (patch)
tree32076a169b37ce9c98916ed2d702de5cab1aeb6c /drivers/net/sc92031.c
parent900d495a189dc3ff5952b98a77d18e3018f8286c (diff)
net: Fix too optimistic NETIF_F_HW_CSUM features
NETIF_F_HW_CSUM is a superset of NETIF_F_IP_CSUM+NETIF_F_IPV6_CSUM, but some drivers miss the difference. Fix this and also fix UFO dependency on checksumming offload as it makes the same mistake in assumptions. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Acked-by: Jon Mason <jon.mason@exar.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sc92031.c')
-rw-r--r--drivers/net/sc92031.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index 417adf372828..76290a8c3c14 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -1449,7 +1449,8 @@ static int __devinit sc92031_probe(struct pci_dev *pdev,
1449 dev->irq = pdev->irq; 1449 dev->irq = pdev->irq;
1450 1450
1451 /* faked with skb_copy_and_csum_dev */ 1451 /* faked with skb_copy_and_csum_dev */
1452 dev->features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA; 1452 dev->features = NETIF_F_SG | NETIF_F_HIGHDMA |
1453 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
1453 1454
1454 dev->netdev_ops = &sc92031_netdev_ops; 1455 dev->netdev_ops = &sc92031_netdev_ops;
1455 dev->watchdog_timeo = TX_TIMEOUT; 1456 dev->watchdog_timeo = TX_TIMEOUT;