From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755583Ab1GPUbL (ORCPT ); Sat, 16 Jul 2011 16:31:11 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:4280 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753009Ab1GPUbJ (ORCPT ); Sat, 16 Jul 2011 16:31:09 -0400 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Subject: Re: linux-next: Tree for July 16 (net/bnx2x) From: "Dmitry Kravkov" Reply-to: dmitry@broadcom.com To: "David Miller" cc: "rdunlap@xenotime.net" , "sfr@canb.auug.org.au" , "netdev@vger.kernel.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Eilon Greenstein" In-Reply-To: <20110716.132643.101780166611692580.davem@davemloft.net> References: <20110717000815.c83755be9598d34ac8431908@canb.auug.org.au> <20110716121427.11760128.rdunlap@xenotime.net> <1310847842.2826.1.camel@lb-tlvb-dmitry> <20110716.132643.101780166611692580.davem@davemloft.net> Organization: BROADCOM Date: Sat, 16 Jul 2011 23:30:56 +0300 Message-ID: <1310848256.2826.3.camel@lb-tlvb-dmitry> MIME-Version: 1.0 X-Mailer: Evolution 2.32.2 X-WSS-ID: 623F29A35ZC2077977-01-01 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 2011-07-16 at 13:26 -0700, David Miller wrote: > From: "Dmitry Kravkov" > Date: Sat, 16 Jul 2011 23:24:02 +0300 > > > @@ -1403,8 +1403,8 @@ void bnx2x_netif_stop(struct bnx2x *bp, int > > disable_hw) > > > > Patch corrupted by your email client, this long line was chopped > up into two lines. > bnx2x: Fix compilation when CNIC is not selected in config Reported-by: Randy Dunlap Signed-off-by: Dmitry Kravkov --- drivers/net/bnx2x/bnx2x_cmn.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c index e5fac62..b05ce93 100644 --- a/drivers/net/bnx2x/bnx2x_cmn.c +++ b/drivers/net/bnx2x/bnx2x_cmn.c @@ -1403,8 +1403,8 @@ void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw) u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb) { -#ifdef BCM_CNIC struct bnx2x *bp = netdev_priv(dev); +#ifdef BCM_CNIC if (NO_FCOE(bp)) return skb_tx_hash(dev, skb); else { -- 1.7.2.2