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

From: Dmitry Kravkov
Date: Sat Jul 16 2011 - 16:24:23 EST


On Sat, 2011-07-16 at 12:14 -0700, Randy Dunlap wrote:
> On Sun, 17 Jul 2011 00:08:15 +1000 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Changes since 20110707:
>
> When BCM_CNIC is not defined:
>
> drivers/net/bnx2x/bnx2x_cmn.c:1429: error: 'bp' undeclared (first use in this function)
>
> Full kernel config file is attached.
>
> ---
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
bnx2x: Fix compilation when CNIC is not selected in config

Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Dmitry Kravkov <dmitry@xxxxxxxxxxxx>
---
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




--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/