diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-22 17:21:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-22 17:21:38 -0400 |
| commit | 1304a7343b30fc4f16045412efdbb4179a3d9255 (patch) | |
| tree | 83d667ac4f62e30f70305ce4cc7e030e3465f92e /net/ipv4/route.c | |
| parent | 1d76efe1577b4323609b1bcbfafa8b731eda071a (diff) | |
| parent | 23dcfa61bac244e1200ff9ad19c6e9144dcb6bb5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index c58137391a3d..50f6d3adb474 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
| @@ -2031,7 +2031,6 @@ struct rtable *__ip_route_output_key(struct net *net, struct flowi4 *fl4) | |||
| 2031 | } | 2031 | } |
| 2032 | dev_out = net->loopback_dev; | 2032 | dev_out = net->loopback_dev; |
| 2033 | fl4->flowi4_oif = dev_out->ifindex; | 2033 | fl4->flowi4_oif = dev_out->ifindex; |
| 2034 | res.fi = NULL; | ||
| 2035 | flags |= RTCF_LOCAL; | 2034 | flags |= RTCF_LOCAL; |
| 2036 | goto make_route; | 2035 | goto make_route; |
| 2037 | } | 2036 | } |