ipwireless: fix compile failure

ipwireless: fix compile failure

[James Bottomley]

There's a brown paper bag compile failure introduced by this patch

commit a01386924874c4d6d67f8a34e66f04452c2abb69
Author: David Sterba <dsterba@suse.cz>
Date:   Mon Jul 28 16:53:32 2008 +0200

    ipwireless: Preallocate received packet buffers with MRU size
 
Really, it can't ever have been even compile tested.  It looks like the
closing bracket is in the wrong place, so this is the fix.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

---

diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c
index 7d500f8..4c1820c 100644
--- a/drivers/char/pcmcia/ipwireless/hardware.c
+++ b/drivers/char/pcmcia/ipwireless/hardware.c
@@ -568,7 +568,7 @@ static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw,
 			list_del(&packet->queue);
 		} else {
 			const int min_capacity =
-				ipwireless_ppp_mru(hw->network + 2);
+				ipwireless_ppp_mru(hw->network) + 2;
 			int new_capacity;
 
 			spin_unlock_irqrestore(&hw->lock, flags);

[resend] [PATCH] Build fallout from scsi merge...

[Ingo Molnar]

* James Bottomley <James.Bottomley@HansenPartnership.com> wrote:

> There's a brown paper bag compile failure introduced by this patch

hm, while at it, i still dont see the scsi build fix below upstream. My 
tests were hit by it too.

	Ingo

------------------->
>From c3d4eb8e157b6e4bb0b87e921bb5743cfc6f8f25 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 28 Jul 2008 11:59:20 +0900
Subject: [PATCH] Build fallout from scsi merge...

On Sun, 27 Jul 2008 17:04:15 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:

>
> From allmodconfig on sparc64:
>
> drivers/scsi/qla2xxx/qla_attr.c: In function 'qla24xx_vport_delete':
> drivers/scsi/qla2xxx/qla_attr.c:1184: error: implicit declaration of function 'msleep'
> make[3]: *** [drivers/scsi/qla2xxx/qla_attr.o] Error 1
> make[3]: *** Waiting for unfinished jobs....

=
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Subject: [PATCH] qla2xxx: fix msleep compile error

drivers/scsi/qla2xxx/qla_attr.c: In function 'qla24xx_vport_delete':
drivers/scsi/qla2xxx/qla_attr.c:1184: error: implicit declaration of function 'msleep'
make[3]: *** [drivers/scsi/qla2xxx/qla_attr.o] Error 1
make[3]: *** Waiting for unfinished jobs....

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Cc: davem@davemloft.net
Cc: James.Bottomley@HansenPartnership.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 drivers/scsi/qla2xxx/qla_attr.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 7a4409a..a319a20 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -8,6 +8,7 @@
 
 #include <linux/kthread.h>
 #include <linux/vmalloc.h>
+#include <linux/delay.h>
 
 static int qla24xx_vport_disable(struct fc_vport *, bool);
 

Re: [resend] [PATCH] Build fallout from scsi merge...

[James Bottomley]

On Tue, 2008-07-29 at 00:35 +0200, Ingo Molnar wrote:
> * James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> 
> > There's a brown paper bag compile failure introduced by this patch
> 
> hm, while at it, i still dont see the scsi build fix below upstream. My 
> tests were hit by it too.

It's in linux next ... I was just waiting to see if there's any more
fallout.

James