Merge branch 'sii-m15w' into upstream

[pandora-kernel.git] / include / net / netdma.h

diff --git a/include/net/netdma.h b/include/net/netdma.h
index 19760eb..7f53cd1 100644 (file)
--- 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();
@@ -37,7 +37,7 @@ static inline struct dma_chan *get_softnet_dma(void)
 }
 
 int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
-               const struct sk_buff *skb, int offset, struct iovec *to,
+               struct sk_buff *skb, int offset, struct iovec *to,
                size_t len, struct dma_pinned_list *pinned_list);
 
 #endif /* CONFIG_NET_DMA */