diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-31 00:54:47 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-31 00:54:47 (GMT) |
| commit | 90d0e08e574d1aa8553ee6179fcf3bf2b333ca6d (patch) | |
| tree | 9733281b423aa819f30334fe230ffb1f4644c5d6 /net/netfilter/ipvs | |
| parent | 648d4febcc7cc65f9e242edd26c44f54a8c171e0 (diff) | |
| parent | f768e5bdefe1ec9adbf7a116dfb156b73cacb582 (diff) | |
| download | linux-90d0e08e574d1aa8553ee6179fcf3bf2b333ca6d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter/IPVS updates for net-next
This small patchset contains three accumulated Netfilter/IPVS updates,
they are:
1) Refactorize common NAT code by encapsulating it into a helper
function, similarly to what we do in other conntrack extensions,
from Florian Westphal.
2) A minor format string mismatch fix for IPVS, from Masanari Iida.
3) Add quota support to the netfilter accounting infrastructure, now
you can add quotas to accounting objects via the nfnetlink interface
and use them from iptables. You can also listen to quota
notifications from userspace. This enhancement from Mathieu Poirier.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/ipvs')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index 4f26ee4..d9da8c4 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -97,7 +97,7 @@ const char *ip_vs_proto_name(unsigned int proto) return "ICMPv6"; #endif default: - sprintf(buf, "IP_%d", proto); + sprintf(buf, "IP_%u", proto); return buf; } } |