* [PATCH] can: fix bfin_can build error after alloc_candev() change
@ 2010-03-08 16:35 Mike Frysinger
2010-03-08 19:47 ` Wolfgang Grandegger
0 siblings, 1 reply; 4+ messages in thread
From: Mike Frysinger @ 2010-03-08 16:35 UTC (permalink / raw)
To: socketcan-core, Urs Thuermann, Oliver Hartkopp
Cc: stable, stable-review, linux-kernel, Barry Song
From: Barry Song <barry.song@analog.com>
Looks like commit a6e4bc530403 didn't include updates to drivers so the
Blackfin CAN driver fails to build now.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
drivers/net/can/bfin_can.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index 680060d..fe10a17 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -27,6 +27,7 @@
#define DRV_NAME "bfin_can"
#define BFIN_CAN_TIMEOUT 100
+#define TX_ECHO_SKB_MAX 1
/*
* bfin can private data
@@ -507,7 +508,7 @@ struct net_device *alloc_bfin_candev(void)
struct net_device *dev;
struct bfin_can_priv *priv;
- dev = alloc_candev(sizeof(*priv));
+ dev = alloc_candev(sizeof(*priv), TX_ECHO_SKB_MAX);
if (!dev)
return NULL;
--
1.7.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] can: fix bfin_can build error after alloc_candev() change
2010-03-08 16:35 [PATCH] can: fix bfin_can build error after alloc_candev() change Mike Frysinger
@ 2010-03-08 19:47 ` Wolfgang Grandegger
2010-03-08 20:14 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Wolfgang Grandegger @ 2010-03-08 19:47 UTC (permalink / raw)
To: Mike Frysinger
Cc: socketcan-core, Urs Thuermann, Oliver Hartkopp, linux-kernel,
Barry Song, stable, stable-review
Mike Frysinger wrote:
> From: Barry Song <barry.song@analog.com>
>
> Looks like commit a6e4bc530403 didn't include updates to drivers so the
> Blackfin CAN driver fails to build now.
>
> Signed-off-by: Barry Song <barry.song@analog.com>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Oops, it did include updates for the drivers but at that time the bfin
driver was not yet mainline but somewhere in the patch pipeline.
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] can: fix bfin_can build error after alloc_candev() change
2010-03-08 19:47 ` Wolfgang Grandegger
@ 2010-03-08 20:14 ` David Miller
2010-03-08 20:47 ` Wolfgang Grandegger
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2010-03-08 20:14 UTC (permalink / raw)
To: wg
Cc: vapier, socketcan-core, urs.thuermann, oliver.hartkopp,
linux-kernel, barry.song, stable, stable-review
From: Wolfgang Grandegger <wg@grandegger.com>
Date: Mon, 08 Mar 2010 20:47:44 +0100
> Mike Frysinger wrote:
>> From: Barry Song <barry.song@analog.com>
>>
>> Looks like commit a6e4bc530403 didn't include updates to drivers so the
>> Blackfin CAN driver fails to build now.
>>
>> Signed-off-by: Barry Song <barry.song@analog.com>
>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>
> Oops, it did include updates for the drivers but at that time the bfin
> driver was not yet mainline but somewhere in the patch pipeline.
>
> Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Applied.
Wolfgang et al., can we add netdev to the MAINTAINERS entry
for CAN stuff so that I don't miss stuff like this?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] can: fix bfin_can build error after alloc_candev() change
2010-03-08 20:14 ` David Miller
@ 2010-03-08 20:47 ` Wolfgang Grandegger
0 siblings, 0 replies; 4+ messages in thread
From: Wolfgang Grandegger @ 2010-03-08 20:47 UTC (permalink / raw)
To: David Miller
Cc: vapier, urs.thuermann, linux-kernel, barry.song, socketcan-core,
oliver.hartkopp, stable-review, stable
David Miller wrote:
> From: Wolfgang Grandegger <wg@grandegger.com>
> Date: Mon, 08 Mar 2010 20:47:44 +0100
>
>> Mike Frysinger wrote:
>>> From: Barry Song <barry.song@analog.com>
>>>
>>> Looks like commit a6e4bc530403 didn't include updates to drivers so the
>>> Blackfin CAN driver fails to build now.
>>>
>>> Signed-off-by: Barry Song <barry.song@analog.com>
>>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>> Oops, it did include updates for the drivers but at that time the bfin
>> driver was not yet mainline but somewhere in the patch pipeline.
>>
>> Acked-by: Wolfgang Grandegger <wg@grandegger.com>
>
> Applied.
>
> Wolfgang et al., can we add netdev to the MAINTAINERS entry
> for CAN stuff so that I don't miss stuff like this?
I see. Just sent a patch for net-2.6 adding "L: netdev@vger.kernel.org".
Wolfgang.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-03-08 20:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-08 16:35 [PATCH] can: fix bfin_can build error after alloc_candev() change Mike Frysinger
2010-03-08 19:47 ` Wolfgang Grandegger
2010-03-08 20:14 ` David Miller
2010-03-08 20:47 ` Wolfgang Grandegger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox