diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-26 20:46:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-26 20:46:35 -0400 |
| commit | 34aa83c2fc23e055968387c8b78ac8bafd735aff (patch) | |
| tree | a53a341d74613e512bf467ea12615f509cb53536 /drivers/net/virtio_net.c | |
| parent | 47936d35edbac5e58064bd15e51136050b2f2717 (diff) | |
| parent | e2a9aa5ab2a4d1fb05fcdfa9661d54e437093297 (diff) | |
| download | linux-34aa83c2fc23e055968387c8b78ac8bafd735aff.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net' restricting a HW workaround alongside cleanups in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 9320d96a1632..3e9246cc49c3 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1989,6 +1989,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_poll_controller = virtnet_netpoll, #endif .ndo_xdp = virtnet_xdp, + .ndo_features_check = passthru_features_check, }; static void virtnet_config_changed_work(struct work_struct *work) |