Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / drivers / net / ethernet / cavium / liquidio / octeon_droq.c

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c b/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
index 79f809479af6e7d865cc7c280c84232622af982e..00970597ada834f0969fdd845d81df588f3a8dfb 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
@@ -226,8 +226,7 @@ int octeon_init_droq(struct octeon_device *oct,
        struct octeon_droq *droq;
        u32 desc_ring_size = 0, c_num_descs = 0, c_buf_size = 0;
        u32 c_pkts_per_intr = 0, c_refill_threshold = 0;
-       int orig_node = dev_to_node(&oct->pci_dev->dev);
-       int numa_node = cpu_to_node(q_no % num_online_cpus());
+       int numa_node = dev_to_node(&oct->pci_dev->dev);
 
        dev_dbg(&oct->pci_dev->dev, "%s[%d]\n", __func__, q_no);
 
@@ -267,13 +266,8 @@ int octeon_init_droq(struct octeon_device *oct,
        droq->buffer_size = c_buf_size;
 
        desc_ring_size = droq->max_count * OCT_DROQ_DESC_SIZE;
-       set_dev_node(&oct->pci_dev->dev, numa_node);
        droq->desc_ring = lio_dma_alloc(oct, desc_ring_size,
                                        (dma_addr_t *)&droq->desc_ring_dma);
-       set_dev_node(&oct->pci_dev->dev, orig_node);
-       if (!droq->desc_ring)
-               droq->desc_ring = lio_dma_alloc(oct, desc_ring_size,
-                                       (dma_addr_t *)&droq->desc_ring_dma);
 
        if (!droq->desc_ring) {
                dev_err(&oct->pci_dev->dev,
@@ -970,7 +964,7 @@ int octeon_create_droq(struct octeon_device *oct,
                       u32 desc_size, void *app_ctx)
 {
        struct octeon_droq *droq;
-       int numa_node = cpu_to_node(q_no % num_online_cpus());
+       int numa_node = dev_to_node(&oct->pci_dev->dev);
 
        if (oct->droq[q_no]) {
                dev_dbg(&oct->pci_dev->dev, "Droq already in use. Cannot create droq %d again\n",