From patchwork Thu Oct 29 23:58:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Philips X-Patchwork-Id: 37232 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id CD5B41007D3 for ; Fri, 30 Oct 2009 10:58:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753559AbZJ2X6P (ORCPT ); Thu, 29 Oct 2009 19:58:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753289AbZJ2X6P (ORCPT ); Thu, 29 Oct 2009 19:58:15 -0400 Received: from cantor.suse.de ([195.135.220.2]:52219 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753033AbZJ2X6O (ORCPT ); Thu, 29 Oct 2009 19:58:14 -0400 Received: from relay1.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 0DC596CB00; Fri, 30 Oct 2009 00:58:18 +0100 (CET) Date: Thu, 29 Oct 2009 16:58:07 -0700 From: Brandon Philips To: Stephen Hemminger Cc: netdev@vger.kernel.org Subject: [PATCH] sky2: set carrier off in probe Message-ID: <20091029235807.GF3228@jenkins.home.ifup.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Before bringing up a sky2 interface up ethtool reports "Link detected: yes". Do as ixgbe does and netif_carrier_off() on probe(). Signed-off-by: Brandon Philips --- drivers/net/sky2.c | 2 ++ 1 file changed, 2 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/net/sky2.c =================================================================== --- linux-2.6.orig/drivers/net/sky2.c +++ linux-2.6/drivers/net/sky2.c @@ -4538,6 +4538,8 @@ static int __devinit sky2_probe(struct p goto err_out_free_netdev; } + netif_carrier_off(dev); + netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_WEIGHT); err = request_irq(pdev->irq, sky2_intr,