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, 3 insertions, 4 deletions

diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c
index 5f186ca550d7..8b3560fd876d 100644
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c
@@ -976,9 +976,8 @@ static void sctp_ulpevent_receive_data(struct sctp_ulpevent *event,
          * In general, the skb passed from IP can have only 1 level of
          * fragments. But we allow multiple levels of fragments.
          */
-        for (frag = skb_shinfo(skb)->frag_list; frag; frag = frag->next) {
+        skb_walk_frags(skb, frag)
                 sctp_ulpevent_receive_data(sctp_skb2event(frag), asoc);
-        }
 }
 
 /* Do accounting for bytes just read by user and release the references to
@@ -1003,7 +1002,7 @@ static void sctp_ulpevent_release_data(struct sctp_ulpevent *event)
                 goto done;
 
         /* Don't forget the fragments. */
-        for (frag = skb_shinfo(skb)->frag_list; frag; frag = frag->next) {
+        skb_walk_frags(skb, frag) {
                 /* NOTE:  skb_shinfos are recursive. Although IP returns
                  * skb's with only 1 level of fragments, SCTP reassembly can
                  * increase the levels.
@@ -1026,7 +1025,7 @@ static void sctp_ulpevent_release_frag_data(struct sctp_ulpevent *event)
                 goto done;
 
         /* Don't forget the fragments. */
-        for (frag = skb_shinfo(skb)->frag_list; frag; frag = frag->next) {
+        skb_walk_frags(skb, frag) {
                 /* NOTE:  skb_shinfos are recursive. Although IP returns
                  * skb's with only 1 level of fragments, SCTP reassembly can
                  * increase the levels.