diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-09 20:44:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-09 20:44:44 +0100 |
| commit | b1109bf085c8dd69537b7876ea83f914dd1fe46a (patch) | |
| tree | 086bd9891a8c92284ea148c93f2242e6c7c02bd2 /net/ipv6 | |
| parent | packet: Kill CONFIG_PACKET_MMAP. (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma... (diff) | |
| download | linux-b1109bf085c8dd69537b7876ea83f914dd1fe46a.tar.xz linux-b1109bf085c8dd69537b7876ea83f914dd1fe46a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/ip6_tables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 480d7f8c9802..8a7e0f52e177 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -1164,10 +1164,10 @@ static int get_info(struct net *net, void __user *user, int *len, int compat) if (t && !IS_ERR(t)) { struct ip6t_getinfo info; const struct xt_table_info *private = t->private; - #ifdef CONFIG_COMPAT + struct xt_table_info tmp; + if (compat) { - struct xt_table_info tmp; ret = compat_table_info(private, &tmp); xt_compat_flush_offsets(AF_INET6); private = &tmp; |