diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-26 22:39:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-26 22:39:08 -0400 |
| commit | b1513c35317c106a1588f3ab32f6888f0e2afd71 (patch) | |
| tree | b2cd68a0d34dd04eb89fcf28e173e5ee22f898fd /net/ipv4/route.c | |
| parent | 78a57b482aa53b040fbc2b2ef0208b54f004161b (diff) | |
| parent | f83246089ca09308425175d47f5e71e6da68b2ef (diff) | |
| download | op-kernel-dev-b1513c35317c106a1588f3ab32f6888f0e2afd71.zip op-kernel-dev-b1513c35317c106a1588f3ab32f6888f0e2afd71.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index a444374..655d9ee 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2403,7 +2403,8 @@ struct rtable *__ip_route_output_key_hash(struct net *net, struct flowi4 *fl4, } /* L3 master device is the loopback for that domain */ - dev_out = l3mdev_master_dev_rcu(dev_out) ? : net->loopback_dev; + dev_out = l3mdev_master_dev_rcu(FIB_RES_DEV(res)) ? : + net->loopback_dev; fl4->flowi4_oif = dev_out->ifindex; flags |= RTCF_LOCAL; goto make_route; |
