summaryrefslogtreecommitdiffstats
path: root/include/net/netdma.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-08-08 09:09:11 +0200
committerPaul Mackerras <paulus@samba.org>2006-08-08 09:09:11 +0200
commit32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch)
tree8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /include/net/netdma.h
parent[POWERPC] Update lppaca offset comments (diff)
parent[POWERPC] Fix might-sleep warning on removing cpus (diff)
downloadlinux-32bc6e095d75233e7c87cc6fa0e07942b124d194.tar.xz
linux-32bc6e095d75233e7c87cc6fa0e07942b124d194.zip
Merge branch 'merge'
Diffstat (limited to 'include/net/netdma.h')
-rw-r--r--include/net/netdma.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netdma.h b/include/net/netdma.h
index ceae5ee85c04..7f53cd1d8b1e 100644
--- a/include/net/netdma.h
+++ b/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();