diff options
| author |   Tom Herbert <tom@herbertland.com> | 2015-12-14 11:19:44 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-15 16:50:20 -0500 |
| commit | c8cd0989bd151fda87bbf10887b3df18021284bc (patch) | |
| tree | 714a0169000dfa3c7456e69b58da887159b71586 /drivers/net/ethernet/sfc | |
| parent | net: Rename NETIF_F_ALL_CSUM to NETIF_F_CSUM_MASK (diff) | |
| download | linux-dev-c8cd0989bd151fda87bbf10887b3df18021284bc.tar.xz linux-dev-c8cd0989bd151fda87bbf10887b3df18021284bc.zip | |
net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM
These netif flags are unnecessary convolutions. It is more
straightforward to just use NETIF_F_HW_CSUM, NETIF_F_IP_CSUM,
and NETIF_F_IPV6_CSUM directly.
This patch also:
- Cleans up can_checksum_protocol
- Simplifies netdev_intersect_features
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 1fe13c733c1e..6f697438545d 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -3128,7 +3128,7 @@ static int efx_pci_probe(struct pci_dev *pci_dev, net_dev->features |= (efx->type->offload_features | NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_TSO | NETIF_F_RXCSUM); - if (efx->type->offload_features & NETIF_F_V6_CSUM) + if (efx->type->offload_features & (NETIF_F_IPV6_CSUM | NETIF_F_HW_CSUM)) net_dev->features |= NETIF_F_TSO6; /* Mask for features that also apply to VLAN devices */ net_dev->vlan_features |= (NETIF_F_HW_CSUM | NETIF_F_SG | |