From b4f208b2acd9b6dd4ed02754d0c4138c07d8a054 Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Fri, 17 Apr 2009 01:38:46 -0700 Subject: [PATCH] --- yaml --- r: 143869 b: refs/heads/master c: 62bcaa13039538c7f794b0cfcbc26e0313e7fcd5 h: refs/heads/master i: 143867: 5583b705e6a2c1494e5424b7fb3d7a1abcd287bb v: v3 --- [refs] | 2 +- trunk/net/can/af_can.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 429c01f44b01..c94512937d9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f72f550c5885419ee1b32f47213087e6640e766b +refs/heads/master: 62bcaa13039538c7f794b0cfcbc26e0313e7fcd5 diff --git a/trunk/net/can/af_can.c b/trunk/net/can/af_can.c index 547bafc79e28..10f0528c3bf5 100644 --- a/trunk/net/can/af_can.c +++ b/trunk/net/can/af_can.c @@ -674,8 +674,8 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev, rcu_read_unlock(); - /* free the skbuff allocated by the netdevice driver */ - kfree_skb(skb); + /* consume the skbuff allocated by the netdevice driver */ + consume_skb(skb); if (matches > 0) { can_stats.matches++;