aboutsummaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorOliver Hartkopp <oliver@hartkopp.net>2009-04-17 01:38:46 -0700
committerDavid S. Miller <davem@davemloft.net>2009-04-17 01:38:46 -0700
commit62bcaa13039538c7f794b0cfcbc26e0313e7fcd5 (patch)
tree51fe02f0a77d778d1bae8aff1b5dcc64d3da1769 /net/can
parentf72f550c5885419ee1b32f47213087e6640e766b (diff)
downloadkernel_samsung_smdk4412-62bcaa13039538c7f794b0cfcbc26e0313e7fcd5.zip
kernel_samsung_smdk4412-62bcaa13039538c7f794b0cfcbc26e0313e7fcd5.tar.gz
kernel_samsung_smdk4412-62bcaa13039538c7f794b0cfcbc26e0313e7fcd5.tar.bz2
can: Network Drop Monitor: Make use of consume_skb() in af_can.c
Since commit ead2ceb0ec9f85cff19c43b5cdb2f8a054484431 ("Network Drop Monitor: Adding kfree_skb_clean for non-drops and modifying end-of-line points for skbs") so called end-of-line points for skb's should use consume_skb() to free the socket buffer. In opposite to consume_skb() the function kfree_skb() is intended to be used for unexpected skb drops e.g. in error conditions that now can trigger the network drop monitor if enabled. This patch moves the skb end-of-line point in af_can.c to use consume_skb(). Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
-rw-r--r--net/can/af_can.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 547bafc..10f0528 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,
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++;