summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2014-04-13 18:08:02 +0300
committerDavid S. Miller <davem@davemloft.net>2014-04-13 23:23:41 -0400
commit91146153da2feab18efab2e13b0945b6bb704ded (patch)
tree5305412f9427f50f69822e5fa16bb6db5f7e2ea0 /net
parentcc6ca3023f2c2bbcd062e9d4cf6afc2ba2821ada (diff)
downloadlinux-91146153da2feab18efab2e13b0945b6bb704ded.tar.gz
linux-91146153da2feab18efab2e13b0945b6bb704ded.tar.bz2
linux-91146153da2feab18efab2e13b0945b6bb704ded.zip
ipv4: return valid RTA_IIF on ip route get
Extend commit 13378cad02afc2adc6c0e07fca03903c7ada0b37 ("ipv4: Change rt->rt_iif encoding.") from 3.6 to return valid RTA_IIF on 'ip route get ... iif DEVICE' instead of rt_iif 0 which is displayed as 'iif *'. inet_iif is not appropriate to use because skb_iif is not set. Use the skb->dev->ifindex instead. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/route.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 34d094cadb11..20a59c388e6e 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2357,7 +2357,7 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src,
}
} else
#endif
- if (nla_put_u32(skb, RTA_IIF, rt->rt_iif))
+ if (nla_put_u32(skb, RTA_IIF, skb->dev->ifindex))
goto nla_put_failure;
}