051966c0c644a1c96092d4206e00704ade813c9a - kernel/msm-4.9

commit	051966c0c644a1c96092d4206e00704ade813c9a	[log] [tgz]
author	Patrick McHardy <kaber@trash.net>	Sun Aug 26 19:14:04 2012 +0200
committer	Pablo Neira Ayuso <pablo@netfilter.org>	Thu Aug 30 03:00:13 2012 +0200
tree	9ca8005f3e2a91cbd710b1f2eb52f49bf5f19f84
parent	811927ccfe90fbfcfff5253ba7f95057f6cae692 [diff]

netfilter: nf_nat: add protoff argument to packet mangling functions

For mangling IPv6 packets the protocol header offset needs to be known
by the NAT packet mangling functions. Add a so far unused protoff argument
and convert the conntrack and NAT helpers to use it in preparation of
IPv6 NAT.

Signed-off-by: Patrick McHardy <kaber@trash.net>

include/linux/netfilter/nf_conntrack_amanda.h[diff]
include/linux/netfilter/nf_conntrack_ftp.h[diff]
include/linux/netfilter/nf_conntrack_h323.h[diff]
include/linux/netfilter/nf_conntrack_irc.h[diff]
include/linux/netfilter/nf_conntrack_pptp.h[diff]
include/linux/netfilter/nf_conntrack_sip.h[diff]
include/net/netfilter/nf_nat_helper.h[diff]
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c[diff]
net/ipv4/netfilter/nf_nat_amanda.c[diff]
net/ipv4/netfilter/nf_nat_ftp.c[diff]
net/ipv4/netfilter/nf_nat_h323.c[diff]
net/ipv4/netfilter/nf_nat_helper.c[diff]
net/ipv4/netfilter/nf_nat_irc.c[diff]
net/ipv4/netfilter/nf_nat_pptp.c[diff]
net/ipv4/netfilter/nf_nat_sip.c[diff]
net/netfilter/ipvs/ip_vs_ftp.c[diff]
net/netfilter/nf_conntrack_amanda.c[diff]
net/netfilter/nf_conntrack_ftp.c[diff]
net/netfilter/nf_conntrack_h323_main.c[diff]
net/netfilter/nf_conntrack_irc.c[diff]
net/netfilter/nf_conntrack_pptp.c[diff]
net/netfilter/nf_conntrack_sip.c[diff]

22 files changed

tree: 9ca8005f3e2a91cbd710b1f2eb52f49bf5f19f84