From: David S. Miller <davem@davemloft.net>
Date: Fri, 20 Mar 2009 09:27:41 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.30-rc1~662^2~174
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2b1c4354de72ced917d2f3fe88117613f992234b;p=~shefty%2Frdma-dev.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/virtio_net.c
---

2b1c4354de72ced917d2f3fe88117613f992234b
diff --cc drivers/net/virtio_net.c
index 3d003392022,e67d16c2e5f..a6f1e19159d
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -951,8 -740,7 +951,9 @@@ static int virtnet_probe(struct virtio_
  		goto unregister;
  	}
  
 +	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;