diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-09 14:44:44 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-09 14:44:44 -0500 |
| commit | b1109bf085c8dd69537b7876ea83f914dd1fe46a (patch) | |
| tree | 086bd9891a8c92284ea148c93f2242e6c7c02bd2 /include/net/netns/ipv4.h | |
| parent | 889b8f964f2f226b7cd5a0a515109e3d8d9d1613 (diff) | |
| parent | 44bfce5c3ec91baf8ffcd075c66711740f29a949 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/netns/ipv4.h')
| -rw-r--r-- | include/net/netns/ipv4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 2eb3814d6258..9a4b8b714079 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h | |||
| @@ -40,6 +40,7 @@ struct netns_ipv4 { | |||
| 40 | struct xt_table *iptable_security; | 40 | struct xt_table *iptable_security; |
| 41 | struct xt_table *nat_table; | 41 | struct xt_table *nat_table; |
| 42 | struct hlist_head *nat_bysource; | 42 | struct hlist_head *nat_bysource; |
| 43 | unsigned int nat_htable_size; | ||
| 43 | int nat_vmalloced; | 44 | int nat_vmalloced; |
| 44 | #endif | 45 | #endif |
| 45 | 46 | ||