From 1de9c7e4ee296b250ffd040141c8e1ef75819f20 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed, 2 Aug 2006 15:02:31 -0700
Subject: [PATCH] --- yaml --- r: 33103 b: refs/heads/master c:
 29bbd72d6ee1dbf2d9f00d022f8e999aa528fb3a h: refs/heads/master i:   33101:
 302826f851e014c2543b28c692be08917b3118c1   33099:
 36721f3bfe5ff150b8fc62f211b4904fa1978478   33095:
 f50a74b433c01b90e43a722deaa2e0a40e76ace9   33087:
 ba5d56b44c4d02a67f9b6f442327fe0f49ea1460 v: v3

---
 [refs]                     | 2 +-
 trunk/include/net/netdma.h | 2 +-
 trunk/net/core/dev.c       | 4 ++--
 trunk/net/ipv4/tcp.c       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bbf04c91edef..2202fc962ccc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95ce568812822931991a24147987c5c75c0ac5b0
+refs/heads/master: 29bbd72d6ee1dbf2d9f00d022f8e999aa528fb3a
diff --git a/trunk/include/net/netdma.h b/trunk/include/net/netdma.h
index ceae5ee85c04..7f53cd1d8b1e 100644
--- a/trunk/include/net/netdma.h
+++ b/trunk/include/net/netdma.h
@@ -29,7 +29,7 @@ static inline struct dma_chan *get_softnet_dma(void)
 {
 	struct dma_chan *chan;
 	rcu_read_lock();
-	chan = rcu_dereference(__get_cpu_var(softnet_data.net_dma));
+	chan = rcu_dereference(__get_cpu_var(softnet_data).net_dma);
 	if (chan)
 		dma_chan_get(chan);
 	rcu_read_unlock();
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index f25d7ecaf035..d95e2626d944 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -3421,7 +3421,7 @@ static void net_dma_rebalance(void)
 
 	if (net_dma_count == 0) {
 		for_each_online_cpu(cpu)
-			rcu_assign_pointer(per_cpu(softnet_data.net_dma, cpu), NULL);
+			rcu_assign_pointer(per_cpu(softnet_data, cpu).net_dma, NULL);
 		return;
 	}
 
@@ -3434,7 +3434,7 @@ static void net_dma_rebalance(void)
 		   + (i < (num_online_cpus() % net_dma_count) ? 1 : 0));
 
 		while(n) {
-			per_cpu(softnet_data.net_dma, cpu) = chan;
+			per_cpu(softnet_data, cpu).net_dma = chan;
 			cpu = next_cpu(cpu, cpu_online_map);
 			n--;
 		}
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 7b621e44b124..934396bb1376 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -1132,7 +1132,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 	tp->ucopy.dma_chan = NULL;
 	preempt_disable();
 	if ((len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) &&
-	    !sysctl_tcp_low_latency && __get_cpu_var(softnet_data.net_dma)) {
+	    !sysctl_tcp_low_latency && __get_cpu_var(softnet_data).net_dma) {
 		preempt_enable_no_resched();
 		tp->ucopy.pinned_list = dma_pin_iovec_pages(msg->msg_iov, len);
 	} else