diff options
author | 2022-10-10 14:02:53 -0700 | |
---|---|---|
committer | 2022-10-10 14:02:53 -0700 | |
commit | 8aeab132e05fefc3a1a5277878629586bd7a3547 (patch) | |
tree | 5fb9dcb752bf709ea0f64374000e8278674c5064 /drivers/vhost | |
parent | Merge tag 'hyperv-next-signed-20221009' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | virtio_pci: don't try to use intxif pin is zero (diff) | |
download | linux-8aeab132e05fefc3a1a5277878629586bd7a3547.tar.gz linux-8aeab132e05fefc3a1a5277878629586bd7a3547.tar.bz2 linux-8aeab132e05fefc3a1a5277878629586bd7a3547.zip |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin:
- 9k mtu perf improvements
- vdpa feature provisioning
- virtio blk SECURE ERASE support
- fixes and cleanups all over the place
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio_pci: don't try to use intxif pin is zero
vDPA: conditionally read MTU and MAC in dev cfg space
vDPA: fix spars cast warning in vdpa_dev_net_mq_config_fill
vDPA: check virtio device features to detect MQ
vDPA: check VIRTIO_NET_F_RSS for max_virtqueue_paris's presence
vDPA: only report driver features if FEATURES_OK is set
vDPA: allow userspace to query features of a vDPA device
virtio_blk: add SECURE ERASE command support
vp_vdpa: support feature provisioning
vdpa_sim_net: support feature provisioning
vdpa: device feature provisioning
virtio-net: use mtu size as buffer length for big packets
virtio-net: introduce and use helper function for guest gso support checks
virtio: drop vp_legacy_set_queue_size
virtio_ring: make vring_alloc_queue_packed prettier
virtio_ring: split: Operators use unified style
vhost: add __init/__exit annotations to module init/exit funcs
Diffstat (limited to 'drivers/vhost')
-rw-r--r-- | drivers/vhost/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index d7a04d573988..20265393aee7 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -1782,7 +1782,7 @@ static struct miscdevice vhost_net_misc = { .fops = &vhost_net_fops, }; -static int vhost_net_init(void) +static int __init vhost_net_init(void) { if (experimental_zcopytx) vhost_net_enable_zcopy(VHOST_NET_VQ_TX); @@ -1790,7 +1790,7 @@ static int vhost_net_init(void) } module_init(vhost_net_init); -static void vhost_net_exit(void) +static void __exit vhost_net_exit(void) { misc_deregister(&vhost_net_misc); } |