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

[Randy Dunlap <rdunlap@xenotime.net>]

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@broadcom.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@xenotime.net>
> Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>

Acked-by: Randy Dunlap <rdunlap@xenotime.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 ***