diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
| commit | 2b1c4354de72ced917d2f3fe88117613f992234b (patch) | |
| tree | 3e7643cad45d94e3c331366418532043bd4fa5a9 /drivers/net/virtio_net.c | |
| parent | 5e140dfc1fe87eae27846f193086724806b33c7d (diff) | |
| parent | 170ebf85160dd128e1c4206cc197cce7d1424705 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/virtio_net.c
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 3d0033920224..a6f1e19159d8 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
| @@ -953,6 +953,7 @@ static int virtnet_probe(struct virtio_device *vdev) | |||
| 953 | 953 | ||
| 954 | vi->status = VIRTIO_NET_S_LINK_UP; | 954 | vi->status = VIRTIO_NET_S_LINK_UP; |
| 955 | virtnet_update_status(vi); | 955 | virtnet_update_status(vi); |
| 956 | netif_carrier_on(dev); | ||
| 956 | 957 | ||
| 957 | pr_debug("virtnet: registered device %s\n", dev->name); | 958 | pr_debug("virtnet: registered device %s\n", dev->name); |
| 958 | return 0; | 959 | return 0; |