checkpatch: make --strict the default for drivers/staging files and patches

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / xfrm4_policy.c

diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 55b3c0f4dde5ba45c0840542f1308613b6f06b8f..bb919b28619fbfd7689d5479ca267ce03db89d71 100644 (file)
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -15,6 +15,7 @@
 #include <net/dst.h>
 #include <net/xfrm.h>
 #include <net/ip.h>
+#include <net/vrf.h>
 
 static struct xfrm_policy_afinfo xfrm4_policy_afinfo;
 
@@ -107,8 +108,10 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
        struct flowi4 *fl4 = &fl->u.ip4;
        int oif = 0;
 
-       if (skb_dst(skb))
-               oif = skb_dst(skb)->dev->ifindex;
+       if (skb_dst(skb)) {
+               oif = vrf_master_ifindex(skb_dst(skb)->dev) ?
+                       : skb_dst(skb)->dev->ifindex;
+       }
 
        memset(fl4, 0, sizeof(struct flowi4));
        fl4->flowi4_mark = skb->mark;