diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-18 12:55:41 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-18 12:55:41 +0400 |
| commit | 41804420586ab41049a14ab7ef04eaa2280b8647 (patch) | |
| tree | f05b39b0c5f1ed229b073f7a993ef717f9f1a363 /net/ipv4/ipmr.c | |
| parent | 7b1e46c5a265b142dd05ff3463fa3e0a1f4e4172 (diff) | |
| parent | 7d0d46da750a252371cb747b48ddda27d1047881 (diff) | |
| download | linux-41804420586ab41049a14ab7ef04eaa2280b8647.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
net/ipv4/tcp_metrics.c
Overlapping changes between the "don't create two tcp metrics objects
with the same key" race fix in net and the addition of the destination
address in the lookup key in net-next.
Minor overlapping changes in bnx2x driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 421a24934ffd..b9b3472975ba 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) static int ipmr_fib_lookup(struct net *net, struct flowi4 *flp4, struct mr_table **mrt) { - struct ipmr_result res; - struct fib_lookup_arg arg = { .result = &res, }; int err; + struct ipmr_result res; + struct fib_lookup_arg arg = { + .result = &res, + .flags = FIB_LOOKUP_NOREF, + }; err = fib_rules_lookup(net->ipv4.mr_rules_ops, flowi4_to_flowi(flp4), 0, &arg); |