net: bgmac: Fix return value check for fixed_phy_register()

[linux.git] / drivers / vhost / net.c

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index ae2273196b0c902c472b3f5cf45249cb6cae37bf..f2ed7167c848096ef8c8f338325bedc278df65fe 100644 (file)
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -546,7 +546,7 @@ static void vhost_net_busy_poll(struct vhost_net *net,
        endtime = busy_clock() + busyloop_timeout;
 
        while (vhost_can_busy_poll(endtime)) {
-               if (vhost_has_work(&net->dev)) {
+               if (vhost_vq_has_work(vq)) {
                        *busyloop_intr = true;
                        break;
                }
@@ -1347,8 +1347,10 @@ static int vhost_net_open(struct inode *inode, struct file *f)
                       VHOST_NET_PKT_WEIGHT, VHOST_NET_WEIGHT, true,
                       NULL);
 
-       vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, EPOLLOUT, dev);
-       vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, EPOLLIN, dev);
+       vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, EPOLLOUT, dev,
+                       vqs[VHOST_NET_VQ_TX]);
+       vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, EPOLLIN, dev,
+                       vqs[VHOST_NET_VQ_RX]);
 
        f->private_data = n;
        n->page_frag.page = NULL;