From owner-svn-src-stable@freebsd.org Sat Jun 4 16:08:43 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1458AB6AB2C; Sat, 4 Jun 2016 16:08:43 +0000 (UTC) (envelope-from arybchik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E02321A0B; Sat, 4 Jun 2016 16:08:42 +0000 (UTC) (envelope-from arybchik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u54G8gWh028270; Sat, 4 Jun 2016 16:08:42 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u54G8fv5028267; Sat, 4 Jun 2016 16:08:41 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201606041608.u54G8fv5028267@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Sat, 4 Jun 2016 16:08:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r301355 - stable/10/sys/dev/sfxge/common X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2016 16:08:43 -0000 Author: arybchik Date: Sat Jun 4 16:08:41 2016 New Revision: 301355 URL: https://svnweb.freebsd.org/changeset/base/301355 Log: MFC r299729 sfxge(4): remove unimplemented MAC reset method Submitted by: Andy Moreton Sponsored by: Solarflare Communications, Inc. Modified: stable/10/sys/dev/sfxge/common/efx_impl.h stable/10/sys/dev/sfxge/common/efx_mac.c stable/10/sys/dev/sfxge/common/efx_nic.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/sfxge/common/efx_impl.h ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_impl.h Sat Jun 4 16:06:19 2016 (r301354) +++ stable/10/sys/dev/sfxge/common/efx_impl.h Sat Jun 4 16:08:41 2016 (r301355) @@ -78,10 +78,9 @@ extern "C" { #define EFX_MOD_FILTER 0x00001000 #define EFX_MOD_LIC 0x00002000 -#define EFX_RESET_MAC 0x00000001 -#define EFX_RESET_PHY 0x00000002 -#define EFX_RESET_RXQ_ERR 0x00000004 -#define EFX_RESET_TXQ_ERR 0x00000008 +#define EFX_RESET_PHY 0x00000001 +#define EFX_RESET_RXQ_ERR 0x00000002 +#define EFX_RESET_TXQ_ERR 0x00000004 typedef enum efx_mac_type_e { EFX_MAC_INVALID = 0, @@ -180,7 +179,6 @@ typedef struct efx_rx_ops_s { } efx_rx_ops_t; typedef struct efx_mac_ops_s { - efx_rc_t (*emo_reset)(efx_nic_t *); /* optional */ efx_rc_t (*emo_poll)(efx_nic_t *, efx_link_mode_t *); efx_rc_t (*emo_up)(efx_nic_t *, boolean_t *); efx_rc_t (*emo_addr_set)(efx_nic_t *); Modified: stable/10/sys/dev/sfxge/common/efx_mac.c ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_mac.c Sat Jun 4 16:06:19 2016 (r301354) +++ stable/10/sys/dev/sfxge/common/efx_mac.c Sat Jun 4 16:08:41 2016 (r301355) @@ -44,7 +44,6 @@ siena_mac_multicast_list_set( #if EFSYS_OPT_SIENA static const efx_mac_ops_t __efx_siena_mac_ops = { - NULL, /* emo_reset */ siena_mac_poll, /* emo_poll */ siena_mac_up, /* emo_up */ siena_mac_reconfigure, /* emo_addr_set */ @@ -66,7 +65,6 @@ static const efx_mac_ops_t __efx_siena_m #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD static const efx_mac_ops_t __efx_ef10_mac_ops = { - NULL, /* emo_reset */ ef10_mac_poll, /* emo_poll */ ef10_mac_up, /* emo_up */ ef10_mac_addr_set, /* emo_addr_set */ @@ -240,21 +238,11 @@ efx_mac_drain( epp->ep_mac_drain = enabled; - if (enabled && emop->emo_reset != NULL) { - if ((rc = emop->emo_reset(enp)) != 0) - goto fail1; - - EFSYS_ASSERT(enp->en_reset_flags & EFX_RESET_MAC); - enp->en_reset_flags &= ~EFX_RESET_PHY; - } - if ((rc = emop->emo_reconfigure(enp)) != 0) - goto fail2; + goto fail1; return (0); -fail2: - EFSYS_PROBE(fail2); fail1: EFSYS_PROBE1(fail1, efx_rc_t, rc); @@ -739,18 +727,8 @@ efx_mac_select( epp->ep_emop = emop; epp->ep_mac_type = type; - if (emop->emo_reset != NULL) { - if ((rc = emop->emo_reset(enp)) != 0) - goto fail2; - - EFSYS_ASSERT(enp->en_reset_flags & EFX_RESET_MAC); - enp->en_reset_flags &= ~EFX_RESET_MAC; - } - return (0); -fail2: - EFSYS_PROBE(fail2); fail1: EFSYS_PROBE1(fail1, efx_rc_t, rc); Modified: stable/10/sys/dev/sfxge/common/efx_nic.c ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_nic.c Sat Jun 4 16:06:19 2016 (r301354) +++ stable/10/sys/dev/sfxge/common/efx_nic.c Sat Jun 4 16:08:41 2016 (r301355) @@ -599,8 +599,6 @@ efx_nic_reset( if ((rc = enop->eno_reset(enp)) != 0) goto fail2; - enp->en_reset_flags |= EFX_RESET_MAC; - return (0); fail2: