liquidio VF: fix incorrect struct being used

The VF driver is using the wrong struct when sending commands to the NIC
firmware, sometimes causing adverse effects in the firmware.  The right
struct is the one that the PF is using, so make the VF use that as well.

Signed-off-by: Prasad Kanneganti <prasad.kanneganti@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: Derek Chickles <derek.chickles@cavium.com>
Signed-off-by: Satanand Burla <satananda.burla@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_nic.c b/drivers/net/ethernet/cavium/liquidio/octeon_nic.c
index c3d6a822836222e48cae80d10aa2549cb3a4f074..0243be8dd56fc32736c13cef0487514efcfe6a68 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_nic.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_nic.c
@@ -49,7 +49,7 @@ octeon_alloc_soft_command_resp(struct octeon_device    *oct,
        /* Add in the response related fields. Opcode and Param are already
         * there.
         */
-       if (OCTEON_CN23XX_PF(oct)) {
+       if (OCTEON_CN23XX_PF(oct) || OCTEON_CN23XX_VF(oct)) {
                ih3      = (struct octeon_instr_ih3 *)&sc->cmd.cmd3.ih3;
                rdp     = (struct octeon_instr_rdp *)&sc->cmd.cmd3.rdp;
                irh     = (struct octeon_instr_irh *)&sc->cmd.cmd3.irh;
@@ -70,7 +70,7 @@ octeon_alloc_soft_command_resp(struct octeon_device    *oct,
 
        *sc->status_word = COMPLETION_WORD_INIT;
 
-       if (OCTEON_CN23XX_PF(oct))
+       if (OCTEON_CN23XX_PF(oct) || OCTEON_CN23XX_VF(oct))
                sc->cmd.cmd3.rptr =  sc->dmarptr;
        else
                sc->cmd.cmd2.rptr =  sc->dmarptr;