From: "Dmitry Kravkov" <dmitry@broadcom•com>
To: David Miller <davem@davemloft•net>
Cc: "rdunlap@xenotime•net" <rdunlap@xenotime•net>,
"sfr@canb•auug.org.au" <sfr@canb•auug.org.au>,
"netdev@vger•kernel.org" <netdev@vger•kernel.org>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
Eilon Greenstein <eilong@broadcom•com>
Subject: Re: linux-next: Tree for July 16 (net/bnx2x)
Date: Sat, 16 Jul 2011 23:30:56 +0300 [thread overview]
Message-ID: <1310848256.2826.3.camel@lb-tlvb-dmitry> (raw)
In-Reply-To: <20110716.132643.101780166611692580.davem@davemloft.net>
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>
---
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
next prev parent reply other threads:[~2011-07-16 20:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 14:08 linux-next: Tree for July 16 Stephen Rothwell
2011-07-16 14:28 ` Stephen Rothwell
2011-07-16 18:57 ` linux-next: Tree for July 16 (kvm) Randy Dunlap
2011-07-18 8:20 ` Avi Kivity
2011-07-16 19:03 ` linux-next: Tree for July 16 (acpi/apei) Randy Dunlap
2011-07-16 22:16 ` [PATCH] ACPI: APEI build fix Len Brown
2011-07-16 23:45 ` Randy Dunlap
2011-07-16 19:10 ` linux-next: Tree for July 16 (bcma) Randy Dunlap
2011-07-16 19:14 ` linux-next: Tree for July 16 Arnd Bergmann
2011-07-16 19:14 ` linux-next: Tree for July 16 (net/bnx2x) Randy Dunlap
2011-07-16 20:24 ` Dmitry Kravkov
2011-07-16 20:26 ` David Miller
2011-07-16 20:30 ` Dmitry Kravkov [this message]
2011-07-16 20:36 ` David Miller
2011-07-16 21:01 ` Randy Dunlap
2011-07-16 19:17 ` linux-next: Tree for July 16 (tpm) Randy Dunlap
2011-07-16 19:25 ` [PATCH -next] watchdog: hpwdt depends on PCI Randy Dunlap
2011-07-18 16:40 ` Mingarelli, Thomas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310848256.2826.3.camel@lb-tlvb-dmitry \
--to=dmitry@broadcom$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=eilong@broadcom$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rdunlap@xenotime$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox