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

3 files changed, 19 insertions, 36 deletions

diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
index fd8e0847b254..80caad1a31a5 100644
--- a/net/appletalk/atalk_proc.c
+++ b/net/appletalk/atalk_proc.c
@@ -204,8 +204,8 @@ static int atalk_seq_socket_show(struct seq_file *seq, void *v)
                         "%02X %d\n",
                    s->sk_type, ntohs(at->src_net), at->src_node, at->src_port,
                    ntohs(at->dest_net), at->dest_node, at->dest_port,
-                   atomic_read(&s->sk_wmem_alloc),
-                   atomic_read(&s->sk_rmem_alloc),
+                   sk_wmem_alloc_get(s),
+                   sk_rmem_alloc_get(s),
                    s->sk_state, SOCK_INODE(s->sk_socket)->i_uid);
 out:
         return 0;
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index d6a9243641af..590b83963622 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -162,8 +162,7 @@ static void atalk_destroy_timer(unsigned long data)
 {
         struct sock *sk = (struct sock *)data;
 
-        if (atomic_read(&sk->sk_wmem_alloc) ||
-            atomic_read(&sk->sk_rmem_alloc)) {
+        if (sk_has_allocations(sk)) {
                 sk->sk_timer.expires = jiffies + SOCK_DESTROY_TIME;
                 add_timer(&sk->sk_timer);
         } else
@@ -175,8 +174,7 @@ static inline void atalk_destroy_socket(struct sock *sk)
         atalk_remove_socket(sk);
         skb_queue_purge(&sk->sk_receive_queue);
 
-        if (atomic_read(&sk->sk_wmem_alloc) ||
-            atomic_read(&sk->sk_rmem_alloc)) {
+        if (sk_has_allocations(sk)) {
                 setup_timer(&sk->sk_timer, atalk_destroy_timer,
                                 (unsigned long)sk);
                 sk->sk_timer.expires    = jiffies + SOCK_DESTROY_TIME;
@@ -939,6 +937,7 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset,
                                    int len, unsigned long sum)
 {
         int start = skb_headlen(skb);
+        struct sk_buff *frag_iter;
         int i, copy;
 
         /* checksum stuff in header space */
@@ -977,26 +976,22 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset,
                 start = end;
         }
 
-        if (skb_shinfo(skb)->frag_list) {
-                struct sk_buff *list = skb_shinfo(skb)->frag_list;
-
-                for (; list; list = list->next) {
-                        int end;
+        skb_walk_frags(skb, frag_iter) {
+                int end;
 
-                        WARN_ON(start > offset + len);
+                WARN_ON(start > offset + len);
 
-                        end = start + list->len;
-                        if ((copy = end - offset) > 0) {
-                                if (copy > len)
-                                        copy = len;
-                                sum = atalk_sum_skb(list, offset - start,
-                                                    copy, sum);
-                                if ((len -= copy) == 0)
-                                        return sum;
-                                offset += copy;
-                        }
-                        start = end;
+                end = start + frag_iter->len;
+                if ((copy = end - offset) > 0) {
+                        if (copy > len)
+                                copy = len;
+                        sum = atalk_sum_skb(frag_iter, offset - start,
+                                            copy, sum);
+                        if ((len -= copy) == 0)
+                                return sum;
+                        offset += copy;
                 }
+                start = end;
         }
 
         BUG_ON(len > 0);
@@ -1753,8 +1748,7 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         switch (cmd) {
                 /* Protocol layer */
                 case TIOCOUTQ: {
-                        long amount = sk->sk_sndbuf -
-                                      atomic_read(&sk->sk_wmem_alloc);
+                        long amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
 
                         if (amount < 0)
                                 amount = 0;
diff --git a/net/appletalk/dev.c b/net/appletalk/dev.c
index 72277d70c980..6c8016f61866 100644
--- a/net/appletalk/dev.c
+++ b/net/appletalk/dev.c
@@ -9,21 +9,10 @@
 #include <linux/if_arp.h>
 #include <linux/if_ltalk.h>
 
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-static int ltalk_change_mtu(struct net_device *dev, int mtu)
-{
-        return -EINVAL;
-}
-#endif
-
 static void ltalk_setup(struct net_device *dev)
 {
         /* Fill in the fields of the device structure with localtalk-generic values. */
 
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-        dev->change_mtu         = ltalk_change_mtu;
-#endif
-
         dev->type               = ARPHRD_LOCALTLK;
         dev->hard_header_len    = LTALK_HLEN;
         dev->mtu                = LTALK_MTU;