diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-20 10:27:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-20 10:27:41 +0100 |
| commit | 2b1c4354de72ced917d2f3fe88117613f992234b (patch) | |
| tree | 3e7643cad45d94e3c331366418532043bd4fa5a9 /drivers/net/virtio_net.c | |
| parent | net: reorder struct Qdisc for better SMP performance (diff) | |
| parent | bas_gigaset: correctly allocate USB interrupt transfer buffer (diff) | |
| download | linux-2b1c4354de72ced917d2f3fe88117613f992234b.tar.xz linux-2b1c4354de72ced917d2f3fe88117613f992234b.zip | |
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) vi->status = VIRTIO_NET_S_LINK_UP; virtnet_update_status(vi); + netif_carrier_on(dev); pr_debug("virtnet: registered device %s\n", dev->name); return 0; |