Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / bridge / netfilter / ebt_ulog.c

diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index 0ddd612787e37487b88780e1c6e700ef8488615f..fc1905c514178a1ae439060588e06a7c5d26e446 100644 (file)
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -35,7 +35,7 @@
 #include <linux/skbuff.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
-#include <linux/netlink.h>
+#include <net/netlink.h>
 #include <linux/netdevice.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_bridge/ebtables.h>
@@ -151,7 +151,7 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,
        else
                copy_len = uloginfo->cprange;
 
-       size = NLMSG_SPACE(sizeof(*pm) + copy_len);
+       size = nlmsg_total_size(sizeof(*pm) + copy_len);
        if (size > nlbufsiz) {
                pr_debug("Size %Zd needed, but nlbufsiz=%d\n", size, nlbufsiz);
                return;