From 0cece6c5832b7617c90adbdc14f231f2db23dca6 Mon Sep 17 00:00:00 2001 From: Raghu Vatsavayi Date: Tue, 14 Jun 2016 16:54:50 -0700 Subject: 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 Signed-off-by: Satanand Burla Signed-off-by: Felix Manlunas Signed-off-by: Raghu Vatsavayi Signed-off-by: David S. Miller --- drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '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 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); -- cgit v1.2.3-59-g8ed1b