From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754561Ab1CIGpS (ORCPT ); Wed, 9 Mar 2011 01:45:18 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:48374 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752829Ab1CIGpO (ORCPT ); Wed, 9 Mar 2011 01:45:14 -0500 Date: Tue, 08 Mar 2011 22:45:51 -0800 (PST) Message-Id: <20110308.224551.226764517.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, emil.s.tantilov@intel.com, stephen.s.ko@intel.com, jeffrey.t.kirsher@intel.com Subject: Re: linux-next: build failure after merge of the net tree From: David Miller In-Reply-To: <20110309134234.32cd09b7.sfr@canb.auug.org.au> References: <20110309134234.32cd09b7.sfr@canb.auug.org.au> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell Date: Wed, 9 Mar 2011 13:42:34 +1100 > Hi all, > > After merging the net tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/net/ixgbe/ixgbe_mbx.c: In function 'ixgbe_init_mbx_params_pf': > drivers/net/ixgbe/ixgbe_mbx.c:456: error: 'struct ixgbe_mbx_info' has no member named 'udelay' > > Caused by commit d7c8a29fc8bd20ba45ec2f52577ed04a988a9500 ("ixgbe: > improve logic in ixgbe_init_mbx_params_pf"). > > I am wondering if that was ever built ... > > I have used the net tree from next-20110308 for today. Probably two minutes after you pulled this a fix went in: commit 5217e8794619ac0a29151f29be20c7d6188303ba Author: Andy Gospodarek Date: Tue Mar 8 14:26:00 2011 -0800 ixgbe: fix compile failure in ixgbe_init_mbx_params_pf This commit: commit d7c8a29fc8bd20ba45ec2f52577ed04a988a9500 Author: Emil Tantilov Date: Thu Mar 3 09:25:02 2011 +0000 ixgbe: improve logic in ixgbe_init_mbx_params_pf incorrectly added a line that accessed mbx->udelay. I'm sure the intent was mbx->usec_delay. This patch fixes the compilation error. Signed-off-by: Andy Gospodarek Signed-off-by: David S. Miller diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/ixgbe_mbx.c index 3cf8aec..c7ed82e 100644 --- a/drivers/net/ixgbe/ixgbe_mbx.c +++ b/drivers/net/ixgbe/ixgbe_mbx.c @@ -453,7 +453,7 @@ void ixgbe_init_mbx_params_pf(struct ixgbe_hw *hw) return; mbx->timeout = 0; - mbx->udelay = 0; + mbx->usec_delay = 0; mbx->stats.msgs_tx = 0; mbx->stats.msgs_rx = 0;