diff options
author | Paul Moore <pmoore@redhat.com> | 2014-12-09 14:38:30 -0500 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2014-12-09 14:38:30 -0500 |
commit | 0f7e94ee40d06f7a04e039392dfee8244bd8a7e0 (patch) | |
tree | 4a14540900d72003b4bc5e06d1531fddba9bd4d5 /kernel | |
parent | 799b601451b21ebe7af0e6e8f6e2ccd4683c5064 (diff) | |
parent | 0288d7183c41c0192d2963d44590f346f4aee917 (diff) |
Merge branch 'next' into upstream for v3.19
Diffstat (limited to 'kernel')
-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 8ee4508f9666..f3a981db91ff 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -842,7 +842,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
842 | s.backlog_limit = audit_backlog_limit; | 842 | s.backlog_limit = audit_backlog_limit; |
843 | s.lost = atomic_read(&audit_lost); | 843 | s.lost = atomic_read(&audit_lost); |
844 | s.backlog = skb_queue_len(&audit_skb_queue); | 844 | s.backlog = skb_queue_len(&audit_skb_queue); |
845 | s.version = AUDIT_VERSION_LATEST; | 845 | s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL; |
846 | s.backlog_wait_time = audit_backlog_wait_time; | 846 | s.backlog_wait_time = audit_backlog_wait_time; |
847 | audit_send_reply(skb, seq, AUDIT_GET, 0, 0, &s, sizeof(s)); | 847 | audit_send_reply(skb, seq, AUDIT_GET, 0, 0, &s, sizeof(s)); |
848 | break; | 848 | break; |