| Message ID | 49E78DE5.10104@hartkopp.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Oliver Hartkopp <oliver@hartkopp.net> Date: Thu, 16 Apr 2009 21:58:29 +0200 > Since commit ead2ceb0ec9f85cff19c43b5cdb2f8a054484431 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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++;
Since commit ead2ceb0ec9f85cff19c43b5cdb2f8a054484431 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> ---