aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorKurt Van Dijck <kurt.van.dijck@eia.be>2009-10-26 20:33:59 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-27 04:02:33 -0400
commit9dbb58d867e90d2528752339751216c955523e62 (patch)
treeac65c38756207bba5852eb92d18ca456946a2413 /drivers/net/can
parent10e85f7f08535c91aa623547c1024d570af4cdcd (diff)
can: sja1000: fix bug using library functions for skb allocation
Commit 7b6856a0 "can: provide library functions for skb allocation" did not properly remove two lines of the SJA1000 driver resulting in a 'skb_over_panic' when calling skb_put, as reported by Kurt. Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/sja1000/sja1000.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 1a9c5958bbd7..782a47fabf2c 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -321,8 +321,6 @@ static void sja1000_rx(struct net_device *dev)
321 if (fi & FI_RTR) 321 if (fi & FI_RTR)
322 id |= CAN_RTR_FLAG; 322 id |= CAN_RTR_FLAG;
323 323
324 cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame));
325 memset(cf, 0, sizeof(struct can_frame));
326 cf->can_id = id; 324 cf->can_id = id;
327 cf->can_dlc = dlc; 325 cf->can_dlc = dlc;
328 for (i = 0; i < dlc; i++) 326 for (i = 0; i < dlc; i++)