2009-10-12 15:39:08

by Alan

Subject: [PATCH 0/2] Build fixes for todays next tree

Couple of networking warns/build fails
---

Alan Cox (2):
ethoc: fix warning from 32bit build
libertas: fix build


drivers/net/ethoc.c | 3 ++-
drivers/net/wireless/libertas/cmdresp.c | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)

--
How do you raise an elephant ... with a crane

2009-10-12 15:39:37

by Alan

Subject: [PATCH 1/2] libertas: fix build

drivers/net/wireless/libertas/cmdresp.c: In function ‘lbs_process_event’:
drivers/net/wireless/libertas/cmdresp.c:519: error: ‘TASK_INTERRUPTIBLE’
undeclared (first use in this function)
drivers/net/wireless/libertas/cmdresp.c:519: error: (Each undeclared
identifier is reported only once
drivers/net/wireless/libertas/cmdresp.c:519: error: for each function it
appears in.)


Signed-off-by: Alan Cox <[email protected]>
---

drivers/net/wireless/libertas/cmdresp.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 47d2b19..9ee8bd1 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -3,6 +3,7 @@
* responses as well as events generated by firmware.
*/
#include <linux/delay.h>
+#include <linux/sched.h>
#include <linux/if_arp.h>
#include <linux/netdevice.h>
#include <asm/unaligned.h>

2009-10-12 15:39:45

by Alan

Subject: [PATCH 2/2] ethoc: fix warning from 32bit build

drivers/net/ethoc.c: In function ‘ethoc_open’:
drivers/net/ethoc.c:667: warning: comparison of distinct pointer types
lacks a cast

Signed-off-by: Alan Cox <[email protected]>
---

drivers/net/ethoc.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 96f5b2a..402a507 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -664,7 +664,8 @@ static int ethoc_open(struct net_device *dev)
return ret;

/* calculate the number of TX/RX buffers, maximum 128 supported */
- num_bd = min(128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ);
+ num_bd = min_t(unsigned int,
+ 128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ);
priv->num_tx = max(min_tx, num_bd / 4);
priv->num_rx = num_bd - priv->num_tx;
ethoc_write(priv, TX_BD_NUM, priv->num_tx);

2009-10-13 07:21:59

by David Miller

Subject: Re: [PATCH 0/2] Build fixes for todays next tree

From: Alan Cox <[email protected]>
Date: Mon, 12 Oct 2009 16:27:17 +0100

> Couple of networking warns/build fails

I'll apply these, thanks Alan.