Merge commit 'v2.6.30-rc1' into sched/urgent

Merge reason: update to latest upstream to queue up fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 3 deletions

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 1fc4a7885c41..74776de523ec 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -584,7 +584,7 @@ drop_n_restore:
                 skb->len = skb_len;
         }
 drop:
-        kfree_skb(skb);
+        consume_skb(skb);
         return 0;
 }
 
@@ -756,8 +756,7 @@ ring_is_full:
         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;
 }