diff options
| -rw-r--r-- | net/ipv4/ipmr.c | 7 | ||||
| -rw-r--r-- | net/ipv6/ip6mr.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 62212c772a4b..1672409f5ba5 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
| @@ -157,9 +157,12 @@ static struct mr_table *ipmr_get_table(struct net *net, u32 id) | |||
| 157 | static int ipmr_fib_lookup(struct net *net, struct flowi4 *flp4, | 157 | static int ipmr_fib_lookup(struct net *net, struct flowi4 *flp4, |
| 158 | struct mr_table **mrt) | 158 | struct mr_table **mrt) |
| 159 | { | 159 | { |
| 160 | struct ipmr_result res; | ||
| 161 | struct fib_lookup_arg arg = { .result = &res, }; | ||
| 162 | int err; | 160 | int err; |
| 161 | struct ipmr_result res; | ||
| 162 | struct fib_lookup_arg arg = { | ||
| 163 | .result = &res, | ||
| 164 | .flags = FIB_LOOKUP_NOREF, | ||
| 165 | }; | ||
| 163 | 166 | ||
| 164 | err = fib_rules_lookup(net->ipv4.mr_rules_ops, | 167 | err = fib_rules_lookup(net->ipv4.mr_rules_ops, |
| 165 | flowi4_to_flowi(flp4), 0, &arg); | 168 | flowi4_to_flowi(flp4), 0, &arg); |
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index f365310bfcca..0eb4038a4d63 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
| @@ -141,9 +141,12 @@ static struct mr6_table *ip6mr_get_table(struct net *net, u32 id) | |||
| 141 | static int ip6mr_fib_lookup(struct net *net, struct flowi6 *flp6, | 141 | static int ip6mr_fib_lookup(struct net *net, struct flowi6 *flp6, |
| 142 | struct mr6_table **mrt) | 142 | struct mr6_table **mrt) |
| 143 | { | 143 | { |
| 144 | struct ip6mr_result res; | ||
| 145 | struct fib_lookup_arg arg = { .result = &res, }; | ||
| 146 | int err; | 144 | int err; |
| 145 | struct ip6mr_result res; | ||
| 146 | struct fib_lookup_arg arg = { | ||
| 147 | .result = &res, | ||
| 148 | .flags = FIB_LOOKUP_NOREF, | ||
| 149 | }; | ||
| 147 | 150 | ||
| 148 | err = fib_rules_lookup(net->ipv6.mr6_rules_ops, | 151 | err = fib_rules_lookup(net->ipv6.mr6_rules_ops, |
| 149 | flowi6_to_flowi(flp6), 0, &arg); | 152 | flowi6_to_flowi(flp6), 0, &arg); |
