From patchwork Tue Jul 7 10:37:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shradha Shah X-Patchwork-Id: 492131 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B1716140187 for ; Tue, 7 Jul 2015 20:37:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756705AbbGGKhk (ORCPT ); Tue, 7 Jul 2015 06:37:40 -0400 Received: from nbfkord-smmo02.seg.att.com ([209.65.160.78]:43372 "EHLO nbfkord-smmo02.seg.att.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755475AbbGGKhj (ORCPT ); Tue, 7 Jul 2015 06:37:39 -0400 Received: from unknown [12.187.104.25] (EHLO webmail.solarflare.com) by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-5) with ESMTP id 3fbab955.2b74dec7d940.333423.00-2463.738765.nbfkord-smmo02.seg.att.com (envelope-from ); Tue, 07 Jul 2015 10:37:39 +0000 (UTC) X-MXL-Hash: 559babf3326e33e0-88932c3e2eaa008c806478e7002e34b35b7ff25e Received: from unknown [12.187.104.25] (EHLO webmail.solarflare.com) by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-5) over TLS secured channel with ESMTP id 1fbab955.0.333421.00-2170.738762.nbfkord-smmo02.seg.att.com (envelope-from ); Tue, 07 Jul 2015 10:37:38 +0000 (UTC) X-MXL-Hash: 559babf205156b6c-c2be42a3cf45ea2925baee74b5a4d94fbaf01c71 Received: from sshah-desktop.uk.level5networks.com (10.17.20.135) by webmail.SolarFlare.com (10.20.40.31) with Microsoft SMTP Server (TLS) id 14.3.158.1; Tue, 7 Jul 2015 03:37:36 -0700 Message-ID: <559BABED.4010300@solarflare.com> Date: Tue, 7 Jul 2015 11:37:33 +0100 From: Shradha Shah User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: David Miller CC: , Subject: [PATCH net 3/3] sfc: suppress handled MCDI failures when changing the MAC address References: <559BAB66.1080905@solarflare.com> In-Reply-To: <559BAB66.1080905@solarflare.com> X-Originating-IP: [10.17.20.135] X-TM-AS-Product-Ver: SMEX-10.0.0.1412-7.000.1014-21660.005 X-TM-AS-Result: No--3.035000-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-AnalysisOut: [v=2.0 cv=KKDt+i5o c=1 sm=1 a=MkjXnYnS3dyNWGSWLXxFFQ==:17 a] X-AnalysisOut: [=zRKbQ67AAAAA:8 a=5ZTteq0x3j8A:10 a=3VnyBeAh6Z0A:10 a=BLce] X-AnalysisOut: [EmwcHowA:10 a=zOBTXjUuO1YA:10 a=R32ohMHh0GI_Q8ariPcA:9 a=p] X-AnalysisOut: [ILNOxqGKmIA:10 a=J0f1r6T511bgtPLC:21 a=O5hm2ea8oc9_yrtT:21] X-Spam: [F=0.2000000000; CM=0.500; S=0.200(2014051901)] X-MAIL-FROM: X-SOURCE-IP: [12.187.104.25] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Daniel Pieczko Signed-off-by: Shradha Shah --- drivers/net/ethernet/sfc/ef10.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c index e0cb361..605cc89 100644 --- a/drivers/net/ethernet/sfc/ef10.c +++ b/drivers/net/ethernet/sfc/ef10.c @@ -3933,8 +3933,8 @@ static int efx_ef10_set_mac_address(struct efx_nic *efx) efx->net_dev->dev_addr); MCDI_SET_DWORD(inbuf, VADAPTOR_SET_MAC_IN_UPSTREAM_PORT_ID, nic_data->vport_id); - rc = efx_mcdi_rpc(efx, MC_CMD_VADAPTOR_SET_MAC, inbuf, - sizeof(inbuf), NULL, 0, NULL); + rc = efx_mcdi_rpc_quiet(efx, MC_CMD_VADAPTOR_SET_MAC, inbuf, + sizeof(inbuf), NULL, 0, NULL); efx_ef10_filter_table_probe(efx); up_write(&efx->filter_sem); @@ -3986,6 +3986,9 @@ static int efx_ef10_set_mac_address(struct efx_nic *efx) * MCFW do not support VFs. */ rc = efx_ef10_vport_set_mac_address(efx); + } else { + efx_mcdi_display_error(efx, MC_CMD_VADAPTOR_SET_MAC, + sizeof(inbuf), NULL, 0, rc); } return rc;