Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 194897
b: refs/heads/master
c: dab1531
h: refs/heads/master
i:
  194895: 1debdf3
v: v3
  • Loading branch information
Alexey Dobriyan authored and Patrick McHardy committed Feb 8, 2010
1 parent bf97ee1 commit a9fbc1e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 38c7233b287481dfb3327dde136801ce500aba58
refs/heads/master: dab1531a07ad7c5be4ebe715a3d08742f0c638e3
4 changes: 2 additions & 2 deletions trunk/net/ipv4/netfilter/arp_tables.c
Original file line number Diff line number Diff line change
Expand Up @@ -925,10 +925,10 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)
if (t && !IS_ERR(t)) {
struct arpt_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(NFPROTO_ARP);
private = &tmp;
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/ipv4/netfilter/ip_tables.c
Original file line number Diff line number Diff line change
Expand Up @@ -1132,10 +1132,10 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)
if (t && !IS_ERR(t)) {
struct ipt_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_INET);
private = &tmp;
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/ipv6/netfilter/ip6_tables.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a9fbc1e

Please sign in to comment.