linux-kernel - Re: linux-next: Tree for July 16 (net/bnx2x)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110716140135.b471aa27.rdunlap@xenotime.net>
Date:	Sat, 16 Jul 2011 14:01:35 -0700
From:	Randy Dunlap <rdunlap@...otime.net>
To:	dmitry@...adcom.com
Cc:	"David Miller" <davem@...emloft.net>,
	"sfr@...b.auug.org.au" <sfr@...b.auug.org.au>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"Eilon Greenstein" <eilong@...adcom.com>
Subject: Re: linux-next: Tree for July 16 (net/bnx2x)

On Sat, 16 Jul 2011 23:30:56 +0300 Dmitry Kravkov wrote:

> On Sat, 2011-07-16 at 13:26 -0700, David Miller wrote:
> > From: "Dmitry Kravkov" <dmitry@...adcom.com>
> > 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 <rdunlap@...otime.net>
> Signed-off-by: Dmitry Kravkov <dmitry@...adcom.com>

Acked-by: Randy Dunlap <rdunlap@...otime.net>

Thanks.

> ---
>  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 {
> -- 


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/