From 1a601c0b7389e746d9dab3c4120718a9097436e0 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Thu, 5 Jan 2006 12:20:02 -0800 Subject: [PATCH] --- yaml --- r: 16234 b: refs/heads/master c: a9b305c4e56f97d6a2ae4f21691bc13797498caf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter/nfnetlink_conntrack.h | 2 -- trunk/net/ipv4/netfilter/ip_conntrack_netlink.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bec59c520e1e..7c48c470d270 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7be6994ec68c38d8e23e647eac649b280c4fe5a +refs/heads/master: a9b305c4e56f97d6a2ae4f21691bc13797498caf diff --git a/trunk/include/linux/netfilter/nfnetlink_conntrack.h b/trunk/include/linux/netfilter/nfnetlink_conntrack.h index b8e9a5b6fb1e..668ec946c8e2 100644 --- a/trunk/include/linux/netfilter/nfnetlink_conntrack.h +++ b/trunk/include/linux/netfilter/nfnetlink_conntrack.h @@ -131,6 +131,4 @@ enum ctattr_help { }; #define CTA_HELP_MAX (__CTA_HELP_MAX - 1) -#define CTA_HELP_MAXNAMESIZE 32 - #endif /* _IPCONNTRACK_NETLINK_H */ diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c index 703f2d2e3464..c9ebbe0d2d9c 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c @@ -161,7 +161,7 @@ ctnetlink_dump_helpinfo(struct sk_buff *skb, const struct ip_conntrack *ct) return 0; nest_helper = NFA_NEST(skb, CTA_HELP); - NFA_PUT(skb, CTA_HELP_NAME, CTA_HELP_MAXNAMESIZE, &ct->helper->name); + NFA_PUT(skb, CTA_HELP_NAME, strlen(ct->helper->name), ct->helper->name); if (ct->helper->to_nfattr) ct->helper->to_nfattr(skb, ct);