diff options
| author | Raghu Vatsavayi <rvatsavayi@caviumnetworks.com> | 2016-08-31 20:03:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-31 23:12:46 +0200 |
| commit | 3258124534f65c94423238b41fa72633529878c4 (patch) | |
| tree | 7a40e701f1173173b7aed59467137fcfc9773cf0 /drivers/net/ethernet/cavium/liquidio/octeon_nic.c | |
| parent | net: wan: sbni: Spelling s/acknoweledge/acknowledge/, Grammar (diff) | |
| download | linux-3258124534f65c94423238b41fa72633529878c4.tar.xz linux-3258124534f65c94423238b41fa72633529878c4.zip | |
liquidio: Consolidate common functionality
Consolidate common functionality of various devices
from different files into lio_core.c/octeon_console.c.
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_nic.c')
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_nic.c b/drivers/net/ethernet/cavium/liquidio/octeon_nic.c index 166727be928f..0c4013de599a 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_nic.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_nic.c @@ -19,7 +19,6 @@ * This file may also be available under a different license from Cavium. * Contact Cavium, Inc. for more information **********************************************************************/ -#include <linux/interrupt.h> #include <linux/pci.h> #include <linux/netdevice.h> #include "liquidio_common.h" @@ -73,12 +72,9 @@ octeon_alloc_soft_command_resp(struct octeon_device *oct, } int octnet_send_nic_data_pkt(struct octeon_device *oct, - struct octnic_data_pkt *ndata, - u32 xmit_more) + struct octnic_data_pkt *ndata) { - int ring_doorbell; - - ring_doorbell = !xmit_more; + int ring_doorbell = 1; return octeon_send_command(oct, ndata->q_no, ring_doorbell, &ndata->cmd, ndata->buf, ndata->datasize, |