diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
| commit | ab11b487402f97975f3ac1eeea09c82f4431481e (patch) | |
| tree | 86337c5cbbd2b0c4bd07c0847a1dc7de3d898147 /kernel/audit.c | |
| parent | 1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1 (diff) | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'kernel/audit.c')
| -rw-r--r-- | kernel/audit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index c71bd26631a2..8296aa516c5a 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -407,7 +407,7 @@ static void kauditd_send_skb(struct sk_buff *skb) | |||
| 407 | audit_hold_skb(skb); | 407 | audit_hold_skb(skb); |
| 408 | } else | 408 | } else |
| 409 | /* drop the extra reference if sent ok */ | 409 | /* drop the extra reference if sent ok */ |
| 410 | kfree_skb(skb); | 410 | consume_skb(skb); |
| 411 | } | 411 | } |
| 412 | 412 | ||
| 413 | static int kauditd_thread(void *dummy) | 413 | static int kauditd_thread(void *dummy) |