diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /include/net/netdma.h | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'include/net/netdma.h')
| -rw-r--r-- | include/net/netdma.h | 2 |
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) | |||
| 29 | { | 29 | { |
| 30 | struct dma_chan *chan; | 30 | struct dma_chan *chan; |
| 31 | rcu_read_lock(); | 31 | rcu_read_lock(); |
| 32 | chan = rcu_dereference(__get_cpu_var(softnet_data.net_dma)); | 32 | chan = rcu_dereference(__get_cpu_var(softnet_data).net_dma); |
| 33 | if (chan) | 33 | if (chan) |
| 34 | dma_chan_get(chan); | 34 | dma_chan_get(chan); |
| 35 | rcu_read_unlock(); | 35 | rcu_read_unlock(); |