diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2010-11-30 09:38:00 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-06 23:59:04 +0300 |
| commit | 7903264402546f45f9bac8ad2bfdb00d00eb124a (patch) | |
| tree | 32076a169b37ce9c98916ed2d702de5cab1aeb6c /drivers/net/benet/be_main.c | |
| parent | 900d495a189dc3ff5952b98a77d18e3018f8286c (diff) | |
| download | linux-7903264402546f45f9bac8ad2bfdb00d00eb124a.tar.xz | |
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/benet/be_main.c')
| -rw-r--r-- | drivers/net/benet/be_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 102567ee68c2..275428032ce2 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -2583,10 +2583,12 @@ static void be_netdev_init(struct net_device *netdev) int i; netdev->features |= NETIF_F_SG | NETIF_F_HW_VLAN_RX | NETIF_F_TSO | - NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER | NETIF_F_HW_CSUM | + NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER | + NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_GRO | NETIF_F_TSO6; - netdev->vlan_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_HW_CSUM; + netdev->vlan_features |= NETIF_F_SG | NETIF_F_TSO | + NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; if (lancer_chip(adapter)) netdev->vlan_features |= NETIF_F_TSO6; |