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, 2 insertions, 2 deletions

diff --git a/net/sctp/input.c b/net/sctp/input.c
index d2e98803ffe3..c0c973e67add 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -81,13 +81,13 @@ static void sctp_add_backlog(struct sock *sk, struct sk_buff *skb);
 /* Calculate the SCTP checksum of an SCTP packet.  */
 static inline int sctp_rcv_checksum(struct sk_buff *skb)
 {
-        struct sk_buff *list = skb_shinfo(skb)->frag_list;
         struct sctphdr *sh = sctp_hdr(skb);
         __le32 cmp = sh->checksum;
+        struct sk_buff *list;
         __le32 val;
         __u32 tmp = sctp_start_cksum((__u8 *)sh, skb_headlen(skb));
 
-        for (; list; list = list->next)
+        skb_walk_frags(skb, list)
                 tmp = sctp_update_cksum((__u8 *)list->data, skb_headlen(list),
                                         tmp);