Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 7 insertions, 1 deletions

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 9c068ab3a834..cb81ca35b0d6 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2027,6 +2027,8 @@ int __xfrm_route_forward(struct sk_buff *skb, unsigned short family)
 {
         struct net *net = dev_net(skb->dev);
         struct flowi fl;
+        struct dst_entry *dst;
+        int res;
 
         if (xfrm_decode_session(skb, &fl, family) < 0) {
                 /* XXX: we should have something like FWDHDRERROR here. */
@@ -2034,7 +2036,11 @@ int __xfrm_route_forward(struct sk_buff *skb, unsigned short family)
                 return 0;
         }
 
-        return xfrm_lookup(net, &skb->dst, &fl, NULL, 0) == 0;
+        dst = skb_dst(skb);
+
+        res = xfrm_lookup(net, &dst, &fl, NULL, 0) == 0;
+        skb_dst_set(skb, dst);
+        return res;
 }
 EXPORT_SYMBOL(__xfrm_route_forward);