Răsfoiți Sursa

[NET]: Fix more per-cpu typos

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Alexey Dobriyan 19 ani în urmă
părinte
comite
29bbd72d6e
3 a modificat fișierele cu 4 adăugiri și 4 ștergeri
  1. 1 1
      include/net/netdma.h
  2. 2 2
      net/core/dev.c
  3. 1 1
      net/ipv4/tcp.c

+ 1 - 1
include/net/netdma.h

@@ -29,7 +29,7 @@ static inline struct dma_chan *get_softnet_dma(void)
 {
 {
 	struct dma_chan *chan;
 	struct dma_chan *chan;
 	rcu_read_lock();
 	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)
 	if (chan)
 		dma_chan_get(chan);
 		dma_chan_get(chan);
 	rcu_read_unlock();
 	rcu_read_unlock();

+ 2 - 2
net/core/dev.c

@@ -3421,7 +3421,7 @@ static void net_dma_rebalance(void)
 
 
 	if (net_dma_count == 0) {
 	if (net_dma_count == 0) {
 		for_each_online_cpu(cpu)
 		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;
 		return;
 	}
 	}
 
 
@@ -3434,7 +3434,7 @@ static void net_dma_rebalance(void)
 		   + (i < (num_online_cpus() % net_dma_count) ? 1 : 0));
 		   + (i < (num_online_cpus() % net_dma_count) ? 1 : 0));
 
 
 		while(n) {
 		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);
 			cpu = next_cpu(cpu, cpu_online_map);
 			n--;
 			n--;
 		}
 		}

+ 1 - 1
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;
 	tp->ucopy.dma_chan = NULL;
 	preempt_disable();
 	preempt_disable();
 	if ((len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) &&
 	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();
 		preempt_enable_no_resched();
 		tp->ucopy.pinned_list = dma_pin_iovec_pages(msg->msg_iov, len);
 		tp->ucopy.pinned_list = dma_pin_iovec_pages(msg->msg_iov, len);
 	} else
 	} else