Merge tag 'gfs2-4.7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...

[cascardo/linux.git] / include / net / route.h

diff --git a/include/net/route.h b/include/net/route.h
index 6de665b..ad777d7 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -325,10 +325,11 @@ static inline struct rtable *ip_route_newports(struct flowi4 *fl4, struct rtable
 
 static inline int inet_iif(const struct sk_buff *skb)
 {
-       int iif = skb_rtable(skb)->rt_iif;
+       struct rtable *rt = skb_rtable(skb);
+
+       if (rt && rt->rt_iif)
+               return rt->rt_iif;
 
-       if (iif)
-               return iif;
        return skb->skb_iif;
 }