diff options
| author | David S. Miller | 2014-05-31 02:54:47 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-05-31 02:54:47 +0200 |
| commit | 90d0e08e574d1aa8553ee6179fcf3bf2b333ca6d (patch) | |
| tree | 9733281b423aa819f30334fe230ffb1f4644c5d6 /lib/cpumask.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff) | |
| parent | netfilter: add helper for adding nat extension (diff) | |
| download | kernel-qcow2-linux-90d0e08e574d1aa8553ee6179fcf3bf2b333ca6d.tar.gz kernel-qcow2-linux-90d0e08e574d1aa8553ee6179fcf3bf2b333ca6d.tar.xz kernel-qcow2-linux-90d0e08e574d1aa8553ee6179fcf3bf2b333ca6d.zip | |
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 'lib/cpumask.c')
0 files changed, 0 insertions, 0 deletions