[PATCH next v2 6/7] xfrm: Use l3_dev for xfrm policy checks.

[Mahesh Bandewar]

From: Mahesh Bandewar <mahe...@google.com>

IPsec, whether it's tunnel mode or transport mode, is still a
function of L3 so all the decisions should be based on the L3
device.

Signed-off-by: Mahesh Bandewar <mahe...@google.com>
CC: Eric Dumazet <eduma...@google.com>
CC: Tim Hockin <thoc...@google.com>
CC: Alex Pollitt <alex.poll...@metaswitch.com>
CC: Matthew Dupre <matthew.du...@metaswitch.com>
---
 include/net/xfrm.h     | 2 +-
 net/xfrm/xfrm_policy.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index d6f6e5006ee9..30f9a351c3b9 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1067,7 +1067,7 @@ static inline int __xfrm_policy_check2(struct sock *sk, 
int dir,
                                       struct sk_buff *skb,
                                       unsigned int family, int reverse)
 {
-       struct net *net = dev_net(skb->dev);
+       struct net *net = dev_net(netif_get_l3_dev(skb->dev));
        int ndir = dir | (reverse ? XFRM_POLICY_MASK + 1 : 0);
 
        if (sk && sk->sk_policy[XFRM_POLICY_IN])
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index b5e665b3cfb0..c5942744f2e3 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2462,7 +2462,7 @@ static inline int secpath_has_nontransport(const struct 
sec_path *sp, int k, int
 int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
                        unsigned short family)
 {
-       struct net *net = dev_net(skb->dev);
+       struct net *net = dev_net(netif_get_l3_dev(skb->dev));
        struct xfrm_policy *pol;
        struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX];
        int npols = 0;
@@ -2620,7 +2620,7 @@ EXPORT_SYMBOL(__xfrm_policy_check);
 
 int __xfrm_route_forward(struct sk_buff *skb, unsigned short family)
 {
-       struct net *net = dev_net(skb->dev);
+       struct net *net = dev_net(netif_get_l3_dev(skb->dev));
        struct flowi fl;
        struct dst_entry *dst;
        int res = 1;
-- 
2.7.0.rc3.207.g0ac5344