From patchwork Tue Apr 20 01:32:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi Shimamoto X-Patchwork-Id: 50505 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 44E8EB7D0B for ; Tue, 20 Apr 2010 11:34:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752338Ab0DTBdr (ORCPT ); Mon, 19 Apr 2010 21:33:47 -0400 Received: from TYO201.gate.nec.co.jp ([202.32.8.193]:50220 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751949Ab0DTBdq (ORCPT ); Mon, 19 Apr 2010 21:33:46 -0400 Received: from mailgate3.nec.co.jp ([10.7.69.195]) by tyo201.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id o3K1Ximu022672; Tue, 20 Apr 2010 10:33:44 +0900 (JST) Received: (from root@localhost) by mailgate3.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) id o3K1XiE01211; Tue, 20 Apr 2010 10:33:44 +0900 (JST) Received: from mail02.kamome.nec.co.jp (mail02.kamome.nec.co.jp [10.25.43.5]) by mailsv3.nec.co.jp (8.13.8/8.13.4) with ESMTP id o3K1XimO011691; Tue, 20 Apr 2010 10:33:44 +0900 (JST) Received: from shikibu.jp.nec.com ([10.26.220.2] [10.26.220.2]) by mail03.kamome.nec.co.jp with ESMTP id BT-MMP-2267482; Tue, 20 Apr 2010 10:32:20 +0900 Received: from [10.41.22.38] ([10.41.22.38] [10.41.22.38]) by mail.jp.nec.com with ESMTP; Tue, 20 Apr 2010 10:32:19 +0900 Message-ID: <4BCD0424.8030501@ct.jp.nec.com> Date: Tue, 20 Apr 2010 10:32:20 +0900 From: Hiroshi Shimamoto User-Agent: Thunderbird 2.0.0.24 (Windows/20100228) MIME-Version: 1.0 To: netdev@vger.kernel.org CC: "linux-kernel@vger.kernel.org" Subject: [PATCH] cxgb3: fix linkup issue Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Hiroshi Shimamoto I encountered an issue that not to link up on cxgb3 fabric. I bisected and found that this regression was introduced by 0f07c4ee8c800923ae7918c231532a9256233eed. Correct to pass phy_addr to cphy_init() at t3_xaui_direct_phy_prep(). Signed-off-by: Hiroshi Shimamoto Acked-by: Divy Le Ray --- drivers/net/cxgb3/ael1002.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c index 5248f9e..35cd367 100644 --- a/drivers/net/cxgb3/ael1002.c +++ b/drivers/net/cxgb3/ael1002.c @@ -934,7 +934,7 @@ static struct cphy_ops xaui_direct_ops = { int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter, int phy_addr, const struct mdio_ops *mdio_ops) { - cphy_init(phy, adapter, MDIO_PRTAD_NONE, &xaui_direct_ops, mdio_ops, + cphy_init(phy, adapter, phy_addr, &xaui_direct_ops, mdio_ops, SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP, "10GBASE-CX4"); return 0;