aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
diff options
context:
space:
mode:
authorRaghu Vatsavayi <rvatsavayi@caviumnetworks.com>2016-06-14 16:54:50 -0700
committerDavid S. Miller <davem@davemloft.net>2016-06-15 21:44:32 -0700
commit0cece6c5832b7617c90adbdc14f231f2db23dca6 (patch)
tree028a8eee84485fc630fd860542149631c139d9d6 /drivers/net/ethernet/cavium/liquidio/octeon_droq.c
parentliquidio: New driver FW command structure (diff)
downloadlinux-dev-0cece6c5832b7617c90adbdc14f231f2db23dca6.tar.xz
linux-dev-0cece6c5832b7617c90adbdc14f231f2db23dca6.zip
liquidio: Replace ifidx for FW commands
This patch decoupled the firmware side ifidx and host side interface number. It also has some minor name change for linkinfo sturct field. Signed-off-by: Derek Chickles <derek.chickles@caviumnetworks.com> Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com> Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com> Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/octeon_droq.c')
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_droq.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c b/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
index a12beaa0c0e2..59a529353f6d 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
@@ -696,7 +696,8 @@ octeon_droq_fast_process_packets(struct octeon_device *oct,
if (droq->ops.fptr) {
droq->ops.fptr(oct->octeon_id,
nicbuf, pkt_len,
- rh, &droq->napi);
+ rh, &droq->napi,
+ droq->ops.farg);
} else {
recv_buffer_free(nicbuf);
}
@@ -963,6 +964,7 @@ int octeon_unregister_droq_ops(struct octeon_device *oct, u32 q_no)
spin_lock_irqsave(&droq->lock, flags);
droq->ops.fptr = NULL;
+ droq->ops.farg = NULL;
droq->ops.drop_on_max = 0;
spin_unlock_irqrestore(&droq->lock, flags);