Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

[net-next-2.6.git] / kernel / audit.c

diff --git a/kernel/audit.c b/kernel/audit.c
index c71bd26631a28ccf3ecb1d90319b7b35f5e6f227..d96045789b546116ba69417c1f7166d3a86bb1c1 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -56,7 +56,6 @@
 #include <net/netlink.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
-#include <linux/inotify.h>
 #include <linux/freezer.h>
 #include <linux/tty.h>
 
@@ -407,7 +406,7 @@ static void kauditd_send_skb(struct sk_buff *skb)
                audit_hold_skb(skb);
        } else
                /* drop the extra reference if sent ok */
-               kfree_skb(skb);
+               consume_skb(skb);
 }
 
 static int kauditd_thread(void *dummy)