[PATCH 10/10] nf_nat: merge nf_conn and nf_nat_info

[Patrick McHardy]

Yasuyuki KOZAKAI wrote:
> Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
> ---
>  include/net/netfilter/nf_nat.h     |   17 ++++++-----------
>  net/ipv4/netfilter/nf_nat_core.c   |   25 ++++++++++++-------------
>  net/ipv4/netfilter/nf_nat_helper.c |   11 +++++------
>  3 files changed, 23 insertions(+), 30 deletions(-)


All applied, thanks a lot for doing this work Yasuyuki.