diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
| commit | 71bfe47f023c55c322607939b786ce0a44627dfc (patch) | |
| tree | f59c37feb00f1df2e0f4ec282ae9c80ad6bb0cdc /include/net/netdma.h | |
| parent | 73c1ac1e3b6c989b9b5f7b2313ac590a1c3b6d6a (diff) | |
| parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
Merge branch 'from-linus' into upstream
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(); |