Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 14 insertions, 3 deletions

diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c
index b9f118530db6..ad3a2555c517 100644
--- a/net/xfrm/xfrm_interface.c
+++ b/net/xfrm/xfrm_interface.c
@@ -70,17 +70,28 @@ static struct xfrm_if *xfrmi_lookup(struct net *net, struct xfrm_state *x)
         return NULL;
 }
 
-static struct xfrm_if *xfrmi_decode_session(struct sk_buff *skb)
+static struct xfrm_if *xfrmi_decode_session(struct sk_buff *skb,
+                                            unsigned short family)
 {
         struct xfrmi_net *xfrmn;
-        int ifindex;
         struct xfrm_if *xi;
+        int ifindex = 0;
 
         if (!secpath_exists(skb) || !skb->dev)
                 return NULL;
 
+        switch (family) {
+        case AF_INET6:
+                ifindex = inet6_sdif(skb);
+                break;
+        case AF_INET:
+                ifindex = inet_sdif(skb);
+                break;
+        }
+        if (!ifindex)
+                ifindex = skb->dev->ifindex;
+
         xfrmn = net_generic(xs_net(xfrm_input_state(skb)), xfrmi_net_id);
-        ifindex = skb->dev->ifindex;
 
         for_each_xfrmi_rcu(xfrmn->xfrmi[0], xi) {
                 if (ifindex == xi->dev->ifindex &&