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 | audit: keep inode pinned (diff) | |
| parent | audit: convert status version to a feature bitmap (diff) | |
| download | linux-dev-0f7e94ee40d06f7a04e039392dfee8244bd8a7e0.tar.xz linux-dev-0f7e94ee40d06f7a04e039392dfee8244bd8a7e0.zip | |
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) s.backlog_limit = audit_backlog_limit; s.lost = atomic_read(&audit_lost); s.backlog = skb_queue_len(&audit_skb_queue); - s.version = AUDIT_VERSION_LATEST; + s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL; s.backlog_wait_time = audit_backlog_wait_time; audit_send_reply(skb, seq, AUDIT_GET, 0, 0, &s, sizeof(s)); break; |