diff options
| author | Kurt Van Dijck <kurt.van.dijck@eia.be> | 2009-10-26 17:33:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-27 01:02:33 -0700 |
| commit | 9dbb58d867e90d2528752339751216c955523e62 (patch) | |
| tree | ac65c38756207bba5852eb92d18ca456946a2413 | |
| parent | 10e85f7f08535c91aa623547c1024d570af4cdcd (diff) | |
| download | blackbird-op-linux-9dbb58d867e90d2528752339751216c955523e62.tar.gz blackbird-op-linux-9dbb58d867e90d2528752339751216c955523e62.zip | |
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>
| -rw-r--r-- | drivers/net/can/sja1000/sja1000.c | 2 |
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) if (fi & FI_RTR) id |= CAN_RTR_FLAG; - cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame)); - memset(cf, 0, sizeof(struct can_frame)); cf->can_id = id; cf->can_dlc = dlc; for (i = 0; i < dlc; i++) |
