diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2010-11-30 01:38:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-06 15:59:04 -0500 |
commit | 7903264402546f45f9bac8ad2bfdb00d00eb124a (patch) | |
tree | 32076a169b37ce9c98916ed2d702de5cab1aeb6c /drivers/net/bnx2x | |
parent | 900d495a189dc3ff5952b98a77d18e3018f8286c (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/bnx2x')
-rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 1552fc3c1351..0068a1dbc064 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c | |||
@@ -8957,7 +8957,7 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev, | |||
8957 | dev->netdev_ops = &bnx2x_netdev_ops; | 8957 | dev->netdev_ops = &bnx2x_netdev_ops; |
8958 | bnx2x_set_ethtool_ops(dev); | 8958 | bnx2x_set_ethtool_ops(dev); |
8959 | dev->features |= NETIF_F_SG; | 8959 | dev->features |= NETIF_F_SG; |
8960 | dev->features |= NETIF_F_HW_CSUM; | 8960 | dev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; |
8961 | if (bp->flags & USING_DAC_FLAG) | 8961 | if (bp->flags & USING_DAC_FLAG) |
8962 | dev->features |= NETIF_F_HIGHDMA; | 8962 | dev->features |= NETIF_F_HIGHDMA; |
8963 | dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN); | 8963 | dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN); |
@@ -8965,7 +8965,7 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev, | |||
8965 | dev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); | 8965 | dev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); |
8966 | 8966 | ||
8967 | dev->vlan_features |= NETIF_F_SG; | 8967 | dev->vlan_features |= NETIF_F_SG; |
8968 | dev->vlan_features |= NETIF_F_HW_CSUM; | 8968 | dev->vlan_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; |
8969 | if (bp->flags & USING_DAC_FLAG) | 8969 | if (bp->flags & USING_DAC_FLAG) |
8970 | dev->vlan_features |= NETIF_F_HIGHDMA; | 8970 | dev->vlan_features |= NETIF_F_HIGHDMA; |
8971 | dev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO_ECN); | 8971 | dev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO_ECN); |