sfc: add output flag decoding to efx_mcdi_set_workaround
authorDaniel Pieczko <dpieczko@solarflare.com>
Tue, 21 Jul 2015 14:09:43 +0000 (15:09 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Jul 2015 05:21:32 +0000 (22:21 -0700)
The initial use of this will be to check a flag reporting if an FLR was
performed on other functions when enabling cascaded multicast filters.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/sfc/ef10.c
drivers/net/ethernet/sfc/mcdi.c
drivers/net/ethernet/sfc/mcdi.h

index 4407117..2b93f63 100644 (file)
@@ -387,7 +387,7 @@ static int efx_ef10_probe(struct efx_nic *efx)
         * First try to enable it, then if we get EPERM, just
         * ask if it's already enabled
         */
-       rc = efx_mcdi_set_workaround(efx, MC_CMD_WORKAROUND_BUG35388, true);
+       rc = efx_mcdi_set_workaround(efx, MC_CMD_WORKAROUND_BUG35388, true, NULL);
        if (rc == 0) {
                nic_data->workaround_35388 = true;
        } else if (rc == -EPERM) {
@@ -2291,8 +2291,9 @@ static int efx_ef10_ev_init(struct efx_channel *channel)
 
                if (implemented & MC_CMD_GET_WORKAROUNDS_OUT_BUG26807 &&
                    !nic_data->workaround_26807) {
-                       rc = efx_mcdi_set_workaround(efx, MC_CMD_WORKAROUND_BUG26807,
-                                                    true);
+                       rc = efx_mcdi_set_workaround(efx,
+                                                    MC_CMD_WORKAROUND_BUG26807,
+                                                    true, NULL);
                        if (!rc)
                                nic_data->workaround_26807 = true;
                        else if (rc == -EPERM)
Simple merge
Simple merge