]> err.no Git - linux-2.6/commit
[NETFILTER]: nf_nat: merge nf_conn and nf_nat_info
authorYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Sun, 8 Jul 2007 05:26:35 +0000 (22:26 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 11 Jul 2007 05:17:37 +0000 (22:17 -0700)
commitb6b84d4a94e95727a4c65841eea23ac60c6aa329
treeb24f89ef0ea4542bf884a2a3eb73f7d479460eae
parentd8a0509a696de60296a66ba4fe4f9eaade497103
[NETFILTER]: nf_nat: merge nf_conn and nf_nat_info

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/netfilter/nf_nat.h
net/ipv4/netfilter/nf_nat_core.c
net/ipv4/netfilter/nf_nat_helper.c