Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

[mirror_ubuntu-artful-kernel.git] / net / netfilter / nfnetlink_acct.c

diff --git a/net/netfilter/nfnetlink_acct.c b/net/netfilter/nfnetlink_acct.c
index 2837d5fb98bd17d283bc64a0e657ee95bb0281dd..9898fb4d0512ce80d0bf970340e5da43db25ce15 100644 (file)
--- a/net/netfilter/nfnetlink_acct.c
+++ b/net/netfilter/nfnetlink_acct.c
@@ -139,7 +139,7 @@ nfnl_acct_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type,
        u64 pkts, bytes;
        u32 old_flags;
 
-       event |= NFNL_SUBSYS_ACCT << 8;
+       event = nfnl_msg_type(NFNL_SUBSYS_ACCT, event);
        nlh = nlmsg_put(skb, portid, seq, event, sizeof(*nfmsg), flags);
        if (nlh == NULL)
                goto nlmsg_failure;