Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29bbd72d authored Aug 02, 2006 by Alexey Dobriyan Committed by David S. Miller Aug 02, 2006

[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>

parent 95ce5688

include/net/netdma.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();

net/core/dev.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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--;
		}

net/ipv4/tcp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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