[PATCH 17/19] be2iscsi: patch from Randy Dunlap

[PATCH 17/19] be2iscsi: patch from Randy Dunlap

[Jayamohan Kallickal]

  This patch add NET because be2iscsi is using sysfs_format_mac function
  Found and patch originally submitted by Randy Dunlap

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jayamohan Kallickal <jayamohank@serverengines.com>
---
 drivers/scsi/be2iscsi/Kconfig   |    2 +-
 drivers/scsi/be2iscsi/be_main.h |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/be2iscsi/Kconfig b/drivers/scsi/be2iscsi/Kconfig
index 2952fcd..9d57142 100644
--- a/drivers/scsi/be2iscsi/Kconfig
+++ b/drivers/scsi/be2iscsi/Kconfig
@@ -1,7 +1,7 @@
 config BE2ISCSI
 	tristate "ServerEngines' 10Gbps iSCSI - BladeEngine 2"
 	depends on PCI && SCSI
-	select SCSI_ISCSI_ATTRS
+	select SCSI_ISCSI_ATTRS && NET
 
 	help
 	This driver implements the iSCSI functionality for ServerEngines'
diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index b38af64..48b7d4d 100644
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -23,6 +23,7 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/if_ether.h>
 #include <linux/in.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
-- 
1.6.5.2

Re: [PATCH 17/19] be2iscsi: patch from Randy Dunlap

[Mike Christie]

On 07/21/2010 05:59 PM, Jayamohan Kallickal wrote:
>    This patch add NET because be2iscsi is using sysfs_format_mac function
>    Found and patch originally submitted by Randy Dunlap
>
> Signed-off-by: Randy Dunlap<randy.dunlap@oracle.com>
> Signed-off-by: Jayamohan Kallickal<jayamohank@serverengines.com>
> ---
>   drivers/scsi/be2iscsi/Kconfig   |    2 +-
>   drivers/scsi/be2iscsi/be_main.h |    1 +
>   2 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/scsi/be2iscsi/Kconfig b/drivers/scsi/be2iscsi/Kconfig
> index 2952fcd..9d57142 100644
> --- a/drivers/scsi/be2iscsi/Kconfig
> +++ b/drivers/scsi/be2iscsi/Kconfig
> @@ -1,7 +1,7 @@
>   config BE2ISCSI
>   	tristate "ServerEngines' 10Gbps iSCSI - BladeEngine 2"
>   	depends on PCI&&  SCSI
> -	select SCSI_ISCSI_ATTRS
> +	select SCSI_ISCSI_ATTRS&&  NET
>

Bah. Ok the code in the patches looks ok, but with this patch I get:

scripts/kconfig/mconf arch/x86/Kconfig
drivers/scsi/be2iscsi/Kconfig:4: invalid option
make[1]: *** [menuconfig] Error 1
make: *** [menuconfig] Error 2

when I try to do

make menuconfig
or
make oldconfig

Re: [PATCH 17/19] be2iscsi: patch from Randy Dunlap

[James Bottomley]

On Thu, 2010-07-22 at 17:32 -0500, Mike Christie wrote:
> On 07/21/2010 05:59 PM, Jayamohan Kallickal wrote:
> >    This patch add NET because be2iscsi is using sysfs_format_mac function
> >    Found and patch originally submitted by Randy Dunlap
> >
> > Signed-off-by: Randy Dunlap<randy.dunlap@oracle.com>
> > Signed-off-by: Jayamohan Kallickal<jayamohank@serverengines.com>
> > ---
> >   drivers/scsi/be2iscsi/Kconfig   |    2 +-
> >   drivers/scsi/be2iscsi/be_main.h |    1 +
> >   2 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/scsi/be2iscsi/Kconfig b/drivers/scsi/be2iscsi/Kconfig
> > index 2952fcd..9d57142 100644
> > --- a/drivers/scsi/be2iscsi/Kconfig
> > +++ b/drivers/scsi/be2iscsi/Kconfig
> > @@ -1,7 +1,7 @@
> >   config BE2ISCSI
> >   	tristate "ServerEngines' 10Gbps iSCSI - BladeEngine 2"
> >   	depends on PCI&&  SCSI
> > -	select SCSI_ISCSI_ATTRS
> > +	select SCSI_ISCSI_ATTRS&&  NET
> >
> 
> Bah. Ok the code in the patches looks ok, but with this patch I get:
> 
> scripts/kconfig/mconf arch/x86/Kconfig
> drivers/scsi/be2iscsi/Kconfig:4: invalid option
> make[1]: *** [menuconfig] Error 1
> make: *** [menuconfig] Error 2
> 
> when I try to do
> 
> make menuconfig
> or
> make oldconfig

That's because the patch is wrong.  The && NET shouldn't be on the
select, it should be on the depends.

So, next time, I want to see a 

From: A.N Author <ana@acme.org>

at the front of the patch, so I pick up the correct authorship, and the
rest of the change log they sent in, plus comments about any fixes or
changes you made, then a signoff set.

James