From patchwork Fri Nov 5 09:47:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 303992 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA59hO81021625 for ; Fri, 5 Nov 2010 09:43:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752762Ab0KEJmk (ORCPT ); Fri, 5 Nov 2010 05:42:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10620 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752683Ab0KEJmj (ORCPT ); Fri, 5 Nov 2010 05:42:39 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oA59gZSO024868 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Nov 2010 05:42:36 -0400 Received: from dhcp-91-158.nay.redhat.com (dhcp-91-158.nay.redhat.com [10.66.91.158]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oA59gWkO032398; Fri, 5 Nov 2010 05:42:33 -0400 Subject: [RESEND PATCH] virtio-net: init link state correctly To: netdev@vger.kernel.org, rusty@rustcorp.com.au, linux-kernel@vger.kernel.org, davem@davemloft.net From: Jason Wang Cc: markmc@redhat.com, kvm@vger.kernel.org, mst@redhat.com Date: Fri, 05 Nov 2010 17:47:18 +0800 Message-ID: <20101105094718.19101.58898.stgit@dhcp-91-158.nay.redhat.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 05 Nov 2010 09:43:25 +0000 (UTC) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index bb6b67f..b6d4028 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -986,9 +986,15 @@ static int virtnet_probe(struct virtio_device *vdev) goto unregister; } - vi->status = VIRTIO_NET_S_LINK_UP; - virtnet_update_status(vi); - netif_carrier_on(dev); + /* Assume link up if device can't report link status, + otherwise get link status from config. */ + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) { + netif_carrier_off(dev); + virtnet_update_status(vi); + } else { + vi->status = VIRTIO_NET_S_LINK_UP; + netif_carrier_on(dev); + } pr_debug("virtnet: registered device %s\n", dev->name); return 0;