diff options
| author | David S. Miller <davem@davemloft.net> | 2021-03-10 05:07:05 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-10 05:07:05 +0300 |
| commit | c1acda9807e2bbe1d2026b44f37d959d6d8266c8 (patch) | |
| tree | 6af2137ad95c0303f9b59d11fe7866e8ebfbcd07 /drivers/net/virtio_net.c | |
| parent | 05a59d79793d482f628a31753c671f2e92178a21 (diff) | |
| parent | 32f91529e2bdbe0d92edb3ced41dfba4beffa84a (diff) | |
| download | linux-c1acda9807e2bbe1d2026b44f37d959d6d8266c8.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2021-03-09
The following pull-request contains BPF updates for your *net-next* tree.
We've added 90 non-merge commits during the last 17 day(s) which contain
a total of 114 files changed, 5158 insertions(+), 1288 deletions(-).
The main changes are:
1) Faster bpf_redirect_map(), from Björn.
2) skmsg cleanup, from Cong.
3) Support for floating point types in BTF, from Ilya.
4) Documentation for sys_bpf commands, from Joe.
5) Support for sk_lookup in bpf_prog_test_run, form Lorenz.
6) Enable task local storage for tracing programs, from Song.
7) bpf_for_each_map_elem() helper, from Yonghong.
====================
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 82e520d2cb12..708a8b2ca25b 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2973,7 +2973,8 @@ static int virtnet_probe(struct virtio_device *vdev) return -ENOMEM; /* Set up network device as normal. */ - dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE; + dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE | + IFF_TX_SKB_NO_LINEAR; dev->netdev_ops = &virtnet_netdev; dev->features = NETIF_F_HIGHDMA; |