From c87ad5ef6423f22f50533909d646637b79abf9b2 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 14 Aug 2011 17:52:33 +0300 Subject: [PATCH] --- yaml --- r: 273203 b: refs/heads/master c: 77dd7693c52d002d24be6842fb0b766116a6079f h: refs/heads/master i: 273201: e36a35c4ef028aae30a155faf16b38ecd4f7e848 273199: 62f1ff1e18b911651502364dda66f8ca8497b71b v: v3 --- [refs] | 2 +- trunk/drivers/net/virtio_net.c | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 8bcd5998a166..3559e5bc16fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ead6f4d42e2866a48d7abf9bc98553f1110b6df +refs/heads/master: 77dd7693c52d002d24be6842fb0b766116a6079f diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c index 91039ab16728..6ee8410443c4 100644 --- a/trunk/drivers/net/virtio_net.c +++ b/trunk/drivers/net/virtio_net.c @@ -925,12 +925,10 @@ static void virtnet_update_status(struct virtnet_info *vi) { u16 v; - if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) - return; - - vi->vdev->config->get(vi->vdev, + if (virtio_config_val(vi->vdev, VIRTIO_NET_F_STATUS, offsetof(struct virtio_net_config, status), - &v, sizeof(v)); + &v) < 0) + return; /* Ignore unknown (future) status bits */ v &= VIRTIO_NET_S_LINK_UP; @@ -1006,11 +1004,9 @@ static int virtnet_probe(struct virtio_device *vdev) } /* Configuration may specify what MAC to use. Otherwise random. */ - if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) { - vdev->config->get(vdev, + if (virtio_config_val_len(vdev, VIRTIO_NET_F_MAC, offsetof(struct virtio_net_config, mac), - dev->dev_addr, dev->addr_len); - } else + dev->dev_addr, dev->addr_len) < 0) random_ether_addr(dev->dev_addr); /* Set up our device-specific information */