diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /net/can/af_can.c | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/can/af_can.c')
| -rw-r--r-- | net/can/af_can.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index 547bafc79e28..10f0528c3bf5 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
| @@ -674,8 +674,8 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev, | |||
| 674 | 674 | ||
| 675 | rcu_read_unlock(); | 675 | rcu_read_unlock(); |
| 676 | 676 | ||
| 677 | /* free the skbuff allocated by the netdevice driver */ | 677 | /* consume the skbuff allocated by the netdevice driver */ |
| 678 | kfree_skb(skb); | 678 | consume_skb(skb); |
| 679 | 679 | ||
| 680 | if (matches > 0) { | 680 | if (matches > 0) { |
| 681 | can_stats.matches++; | 681 | can_stats.matches++; |