diff options
author | Dan Williams <dan.j.williams@intel.com> | 2013-12-30 15:37:29 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2014-09-28 10:05:16 -0400 |
commit | 7bced397510ab569d31de4c70b39e13355046387 (patch) | |
tree | faa4067a53e42acffc752e9a153e7dbaed4126e5 /drivers/dma/ioat | |
parent | 08223d80df38e666a42d7c82eb340db55c6e03bd (diff) |
net_dma: simple removal
Per commit "77873803363c net_dma: mark broken" net_dma is no longer used
and there is no plan to fix it.
This is the mechanical removal of bits in CONFIG_NET_DMA ifdef guards.
Reverting the remainder of the net_dma induced changes is deferred to
subsequent patches.
Marked for stable due to Roman's report of a memory leak in
dma_pin_iovec_pages():
https://lkml.org/lkml/2014/9/3/177
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: David Whipple <whipple@securedatainnovations.ch>
Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Cc: <stable@vger.kernel.org>
Reported-by: Roman Gushchin <klamm@yandex-team.ru>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/ioat')
-rw-r--r-- | drivers/dma/ioat/dma.c | 1 | ||||
-rw-r--r-- | drivers/dma/ioat/dma.h | 7 | ||||
-rw-r--r-- | drivers/dma/ioat/dma_v2.c | 1 | ||||
-rw-r--r-- | drivers/dma/ioat/dma_v3.c | 1 |
4 files changed, 0 insertions, 10 deletions
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index b76c1485933b..940c1502a8b5 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c | |||
@@ -1222,7 +1222,6 @@ int ioat1_dma_probe(struct ioatdma_device *device, int dca) | |||
1222 | err = ioat_probe(device); | 1222 | err = ioat_probe(device); |
1223 | if (err) | 1223 | if (err) |
1224 | return err; | 1224 | return err; |
1225 | ioat_set_tcp_copy_break(4096); | ||
1226 | err = ioat_register(device); | 1225 | err = ioat_register(device); |
1227 | if (err) | 1226 | if (err) |
1228 | return err; | 1227 | return err; |
diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h index e982f00a9843..d63f68b1aa35 100644 --- a/drivers/dma/ioat/dma.h +++ b/drivers/dma/ioat/dma.h | |||
@@ -214,13 +214,6 @@ __dump_desc_dbg(struct ioat_chan_common *chan, struct ioat_dma_descriptor *hw, | |||
214 | #define dump_desc_dbg(c, d) \ | 214 | #define dump_desc_dbg(c, d) \ |
215 | ({ if (d) __dump_desc_dbg(&c->base, d->hw, &d->txd, desc_id(d)); 0; }) | 215 | ({ if (d) __dump_desc_dbg(&c->base, d->hw, &d->txd, desc_id(d)); 0; }) |
216 | 216 | ||
217 | static inline void ioat_set_tcp_copy_break(unsigned long copybreak) | ||
218 | { | ||
219 | #ifdef CONFIG_NET_DMA | ||
220 | sysctl_tcp_dma_copybreak = copybreak; | ||
221 | #endif | ||
222 | } | ||
223 | |||
224 | static inline struct ioat_chan_common * | 217 | static inline struct ioat_chan_common * |
225 | ioat_chan_by_index(struct ioatdma_device *device, int index) | 218 | ioat_chan_by_index(struct ioatdma_device *device, int index) |
226 | { | 219 | { |
diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c index 2ce9be498608..695483e6be32 100644 --- a/drivers/dma/ioat/dma_v2.c +++ b/drivers/dma/ioat/dma_v2.c | |||
@@ -900,7 +900,6 @@ int ioat2_dma_probe(struct ioatdma_device *device, int dca) | |||
900 | err = ioat_probe(device); | 900 | err = ioat_probe(device); |
901 | if (err) | 901 | if (err) |
902 | return err; | 902 | return err; |
903 | ioat_set_tcp_copy_break(2048); | ||
904 | 903 | ||
905 | list_for_each_entry(c, &dma->channels, device_node) { | 904 | list_for_each_entry(c, &dma->channels, device_node) { |
906 | chan = to_chan_common(c); | 905 | chan = to_chan_common(c); |
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c index 85971d6e9646..895f869d6c2c 100644 --- a/drivers/dma/ioat/dma_v3.c +++ b/drivers/dma/ioat/dma_v3.c | |||
@@ -1655,7 +1655,6 @@ int ioat3_dma_probe(struct ioatdma_device *device, int dca) | |||
1655 | err = ioat_probe(device); | 1655 | err = ioat_probe(device); |
1656 | if (err) | 1656 | if (err) |
1657 | return err; | 1657 | return err; |
1658 | ioat_set_tcp_copy_break(262144); | ||
1659 | 1658 | ||
1660 | list_for_each_entry(c, &dma->channels, device_node) { | 1659 | list_for_each_entry(c, &dma->channels, device_node) { |
1661 | chan = to_chan_common(c); | 1660 | chan = to_chan_common(c); |