diff options
author | Hong zhi guo <honkiko@gmail.com> | 2013-03-27 02:47:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-28 14:25:25 -0400 |
commit | 573ce260b385a4d14a1ef046558fad9f1daeee42 (patch) | |
tree | b577de870934c583a66514b1206964fbd262c340 /net/bridge | |
parent | e5c5d22e8dcf7c2d430336cbf8e180bd38e8daf1 (diff) |
net-next: replace obsolete NLMSG_* with type safe nlmsg_*
Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/netfilter/ebt_ulog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index 442b0321acb9..961d870ab283 100644 --- a/net/bridge/netfilter/ebt_ulog.c +++ b/net/bridge/netfilter/ebt_ulog.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <linux/skbuff.h> | 35 | #include <linux/skbuff.h> |
36 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
37 | #include <linux/timer.h> | 37 | #include <linux/timer.h> |
38 | #include <linux/netlink.h> | 38 | #include <net/netlink.h> |
39 | #include <linux/netdevice.h> | 39 | #include <linux/netdevice.h> |
40 | #include <linux/netfilter/x_tables.h> | 40 | #include <linux/netfilter/x_tables.h> |
41 | #include <linux/netfilter_bridge/ebtables.h> | 41 | #include <linux/netfilter_bridge/ebtables.h> |
@@ -134,7 +134,7 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb, | |||
134 | else | 134 | else |
135 | copy_len = uloginfo->cprange; | 135 | copy_len = uloginfo->cprange; |
136 | 136 | ||
137 | size = NLMSG_SPACE(sizeof(*pm) + copy_len); | 137 | size = nlmsg_total_size(sizeof(*pm) + copy_len); |
138 | if (size > nlbufsiz) { | 138 | if (size > nlbufsiz) { |
139 | pr_debug("Size %Zd needed, but nlbufsiz=%d\n", size, nlbufsiz); | 139 | pr_debug("Size %Zd needed, but nlbufsiz=%d\n", size, nlbufsiz); |
140 | return; | 140 | return; |