diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-02-01 09:12:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-02-01 09:12:25 +0100 |
| commit | ed5c8c854f2b990dfa4d85c4995d115768a05d3c (patch) | |
| tree | a4a826795ec6784f25bebade98bdb20121d9c211 /drivers/net/ethernet/ibm/ibmveth.c | |
| parent | sched/rt: Add a missing rescheduling point (diff) | |
| parent | Merge tag 'trace-4.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
| download | linux-ed5c8c854f2b990dfa4d85c4995d115768a05d3c.tar.xz linux-ed5c8c854f2b990dfa4d85c4995d115768a05d3c.zip | |
Merge branch 'linus' into sched/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmveth.c')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmveth.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index a831f947ca8c..309f5c66083c 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c @@ -1601,8 +1601,11 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) netdev->netdev_ops = &ibmveth_netdev_ops; netdev->ethtool_ops = &netdev_ethtool_ops; SET_NETDEV_DEV(netdev, &dev->dev); - netdev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM | - NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; + netdev->hw_features = NETIF_F_SG; + if (vio_get_attribute(dev, "ibm,illan-options", NULL) != NULL) { + netdev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | + NETIF_F_RXCSUM; + } netdev->features |= netdev->hw_features; |