Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9d5dcc8 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Jeff Garzik
Browse files

virtio_net: Fix oops on early interrupts - introduced by virtio reset code 



Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7a7d23da

drivers/net/virtio_net.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -361,6 +361,7 @@ static int virtnet_probe(struct virtio_device *vdev) 
	netif_napi_add(dev, &vi->napi, virtnet_poll, napi_weight);

	netif_napi_add(dev, &vi->napi, virtnet_poll, napi_weight);

	vi->dev = dev;

	vi->dev = dev;

	vi->vdev = vdev;

	vi->vdev = vdev;

	vdev->priv = vi;





	/* We expect two virtqueues, receive then send. */

	/* We expect two virtqueues, receive then send. */

	vi->rvq = vdev->config->find_vq(vdev, 0, skb_recv_done);

	vi->rvq = vdev->config->find_vq(vdev, 0, skb_recv_done);
@@ -395,7 +396,6 @@ static int virtnet_probe(struct virtio_device *vdev) 
	}

	}





	pr_debug("virtnet: registered device %s\n", dev->name);

	pr_debug("virtnet: registered device %s\n", dev->name);

	vdev->priv = vi;

	return 0;

	return 0;





unregister:

unregister: