diff options
author | David S. Miller <davem@davemloft.net> | 2012-08-22 18:48:21 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-22 18:48:52 -0700 |
commit | bf277b0ccea7d2422b85e232017ce3fddbe9c49c (patch) | |
tree | 252232255b8a6024eccf2fea668bb89de5ae3073 /net/xfrm/xfrm_policy.c | |
parent | bba6ec7e4963e30366359686f34e5bdb00b1a066 (diff) | |
parent | 90efbed18a30d78145419cdbd44f9ec152efeb16 (diff) | |
download | op-kernel-dev-bf277b0ccea7d2422b85e232017ce3fddbe9c49c.zip op-kernel-dev-bf277b0ccea7d2422b85e232017ce3fddbe9c49c.tar.gz |
Merge git://1984.lsi.us.es/nf-next
Pablo Neira Ayuso says:
====================
This is the first batch of Netfilter and IPVS updates for your
net-next tree. Mostly cleanups for the Netfilter side. They are:
* Remove unnecessary RTNL locking now that we have support
for namespace in nf_conntrack, from Patrick McHardy.
* Cleanup to eliminate unnecessary goto in the initialization
path of several Netfilter tables, from Jean Sacren.
* Another cleanup from Wu Fengguang, this time to PTR_RET instead
of if IS_ERR then return PTR_ERR.
* Use list_for_each_entry_continue_rcu in nf_iterate, from
Michael Wang.
* Add pmtu_disc sysctl option to disable PMTU in their tunneling
transmitter, from Julian Anastasov.
* Generalize application protocol registration in IPVS and modify
IPVS FTP helper to use it, from Julian Anastasov.
* update Kconfig. The IPVS FTP helper depends on the Netfilter FTP
helper for NAT support, from Julian Anastasov.
* Add logic to update PMTU for IPIP packets in IPVS, again
from Julian Anastasov.
* A couple of sparse warning fixes for IPVS and Netfilter from
Claudiu Ghioc and Patrick McHardy respectively.
Patrick's IPv6 NAT changes will follow after this batch, I need
to flush this batch first before refreshing my tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
0 files changed, 0 insertions, 0 deletions