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

[cascardo/linux.git] / drivers / net / ethernet / cavium / liquidio / octeon_nic.h

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_nic.h b/drivers/net/ethernet/cavium/liquidio/octeon_nic.h
index b71a2bb..4b8da67 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_nic.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_nic.h
@@ -138,7 +138,7 @@ octnet_prepare_pci_cmd_o2(struct octeon_device *oct,
        /* assume that rflag is cleared so therefore front data will only have
         * irh and ossp[0], ossp[1] for a total of 32 bytes
         */
-       ih2->fsz = 24;
+       ih2->fsz = LIO_PCICMD_O2;
 
        ih2->tagtype = ORDERED_TAG;
        ih2->grp = DEFAULT_POW_GRP;
@@ -196,7 +196,7 @@ octnet_prepare_pci_cmd_o3(struct octeon_device *oct,
         */
        ih3->pkind       = oct->instr_queue[setup->s.iq_no]->txpciq.s.pkind;
        /*PKI IH*/
-       ih3->fsz = 24 + 8;
+       ih3->fsz = LIO_PCICMD_O3;
 
        if (!setup->s.gather) {
                ih3->dlengsz = setup->s.u.datasize;
@@ -278,7 +278,7 @@ octeon_alloc_soft_command_resp(struct octeon_device    *oct,
  * queue should be stopped, and IQ_SEND_OK if it sent okay.
  */
 int octnet_send_nic_data_pkt(struct octeon_device *oct,
-                            struct octnic_data_pkt *ndata, u32 xmit_more);
+                            struct octnic_data_pkt *ndata);
 
 /** Send a NIC control packet to the device
  * @param oct - octeon device pointer