From 35e209657245257ed53d43c58bb8921902436e85 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 25 Feb 2009 00:36:42 +0000 Subject: [PATCH] --- yaml --- r: 134763 b: refs/heads/master c: acb5d75b9bcff73d32d3471a9b3e9a4189223e48 h: refs/heads/master i: 134761: e412b67608b0af4ea8e9695f952dcaf80f34a9af 134759: 239c1147c2ce1bd0d9ce1ccc7d2e5674de4eea40 v: v3 --- [refs] | 2 +- trunk/net/packet/af_packet.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 65c520dcdfba..c29d3343676e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce030edfb4ba6734248b8d9f98d0a6f1dcd142e7 +refs/heads/master: acb5d75b9bcff73d32d3471a9b3e9a4189223e48 diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c index 1fc4a7885c41..d8cc006fac45 100644 --- a/trunk/net/packet/af_packet.c +++ b/trunk/net/packet/af_packet.c @@ -756,8 +756,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe spin_unlock(&sk->sk_receive_queue.lock); sk->sk_data_ready(sk, 0); - if (copy_skb) - kfree_skb(copy_skb); + kfree_skb(copy_skb); goto drop_n_restore; }