diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-11-28 02:19:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-28 02:19:15 -0800 |
| commit | ed77a89c30fa03dcb234a84ddea710b3fb7b62da (patch) | |
| tree | 69f3e2c2bbf2fdd4f742e891441f01307d1d1f49 /include/net/netns | |
| parent | decnet: compile fix for removal of byteorder wrapper (diff) | |
| parent | netfilter: fix warning in net/netfilter/nf_conntrack_ftp.c (diff) | |
| download | linux-dev-ed77a89c30fa03dcb234a84ddea710b3fb7b62da.tar.xz linux-dev-ed77a89c30fa03dcb234a84ddea710b3fb7b62da.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Conflicts:
net/netfilter/nf_conntrack_netlink.c
Diffstat (limited to 'include/net/netns')
| -rw-r--r-- | include/net/netns/x_tables.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h index b8093971ccb4..9554a644a8f8 100644 --- a/include/net/netns/x_tables.h +++ b/include/net/netns/x_tables.h @@ -4,7 +4,12 @@ #include <linux/list.h> #include <linux/netfilter.h> +struct ebt_table; + struct netns_xt { struct list_head tables[NFPROTO_NUMPROTO]; + struct ebt_table *broute_table; + struct ebt_table *frame_filter; + struct ebt_table *frame_nat; }; #endif |