Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Fri, 20 Mar 2009 09:27:41 +0000 (02:27 -0700)]
Conflicts:
drivers/net/virtio_net.c

1  2 
drivers/net/bnx2.c
drivers/net/bonding/bond_main.c
drivers/net/smsc911x.c
drivers/net/virtio_net.c
net/core/dev.c
net/ipv6/sit.c

Simple merge
Simple merge
Simple merge
@@@ -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;
diff --cc net/core/dev.c
Simple merge
diff --cc net/ipv6/sit.c
Simple merge