netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anish Bhatt <anish@chelsio.com>
To: netdev@vger.kernel.org
Cc: linux-scsi@vger.kernel.org, davem@davemloft.net,
	JBottomley@parallels.com, mchan@broadcom.com,
	eddie.wai@broadcom.com, rdunlap@infradead.org,
	jim.epost@gmail.com, Anish Bhatt <anish@chelsio.com>
Subject: [PATCH net 2/2] bnx2i/bnx2fc : fix randconfig error in next-20140909
Date: Mon, 15 Sep 2014 13:45:21 -0700	[thread overview]
Message-ID: <1410813921-24400-3-git-send-email-anish@chelsio.com> (raw)
In-Reply-To: <1410813921-24400-1-git-send-email-anish@chelsio.com>

Just like CNIC, tristate of these two modules is also dependent on IPV6.
These need to be handled separately as they select CNIC, which can override
tristate for CNIC from 'm' to 'y', which can cause build failures when ipv6 is
 compiled as a module even if CNIC's Kconfig will only 'm' or 'n' when ipv6 is
compiled as a module.

Fixes: c99d667e8527 ("cnic : Cleanup CONFIG_IPV6 & VLAN check")
Signed-off-by: Anish Bhatt <anish@chelsio.com>

---
 drivers/scsi/bnx2fc/Kconfig | 1 +
 drivers/scsi/bnx2i/Kconfig  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/scsi/bnx2fc/Kconfig b/drivers/scsi/bnx2fc/Kconfig
index f245d54..02b0ba8 100644
--- a/drivers/scsi/bnx2fc/Kconfig
+++ b/drivers/scsi/bnx2fc/Kconfig
@@ -1,6 +1,7 @@
 config SCSI_BNX2X_FCOE
 	tristate "QLogic NetXtreme II FCoE support"
 	depends on PCI
+	depends on (IPV6 || IPV6=n)
 	select NETDEVICES
 	select ETHERNET
 	select NET_VENDOR_BROADCOM
diff --git a/drivers/scsi/bnx2i/Kconfig b/drivers/scsi/bnx2i/Kconfig
index 44ce54e..ba30ff8 100644
--- a/drivers/scsi/bnx2i/Kconfig
+++ b/drivers/scsi/bnx2i/Kconfig
@@ -2,6 +2,7 @@ config SCSI_BNX2_ISCSI
 	tristate "QLogic NetXtreme II iSCSI support"
 	depends on NET
 	depends on PCI
+	depends on (IPV6 || IPV6=n)
 	select SCSI_ISCSI_ATTRS
 	select NETDEVICES
 	select ETHERNET
-- 
2.1.0


  parent reply	other threads:[~2014-09-15 20:45 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-15 20:45 [PATCH net 0/2] Fix randconfig errros in bnx2i/bnx2fc caused by IPV6 Anish Bhatt
2014-09-15 20:45 ` [PATCH net 1/2] scsi_netlink : Make SCSI_NETLINK dependent on NET instead of selecting NET Anish Bhatt
2014-09-16  0:20   ` [PATCH 3] scsi: fix build errors, SCSI_FC_ATTRS needs to depend on SCSI && NET Randy Dunlap
2014-09-16  3:00     ` Anish Bhatt
2014-09-16  3:17       ` Randy Dunlap
2014-09-16  4:11         ` Anish Bhatt
2014-09-16  4:07     ` David Miller
2014-09-15 20:45 ` Anish Bhatt [this message]
2014-09-15 21:45 ` [PATCH net 0/2] Fix randconfig errros in bnx2i/bnx2fc caused by IPV6 David Miller

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=1410813921-24400-3-git-send-email-anish@chelsio.com \
    --to=anish@chelsio.com \
    --cc=JBottomley@parallels.com \
    --cc=davem@davemloft.net \
    --cc=eddie.wai@broadcom.com \
    --cc=jim.epost@gmail.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=mchan@broadcom.com \
    --cc=netdev@vger.kernel.org \
    --cc=rdunlap@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).