Date: Fri, 13 May 2016 07:15:02 +0000 (UTC) From: Andrew Rybchenko <arybchik@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299609 - head/sys/dev/sfxge/common Message-ID: <201605130715.u4D7F28L040189@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Fri May 13 07:15:02 2016 New Revision: 299609 URL: https://svnweb.freebsd.org/changeset/base/299609 Log: sfxge(4): rename falconsiena_mac_* Falcon support has been removed, so this code only supports Siena. Reviewed by: Andy Moreton <amoreton at solarflare.com> Sponsored by: Solarflare Communications, Inc. MFC after: 1 week Modified: head/sys/dev/sfxge/common/efx_mac.c Modified: head/sys/dev/sfxge/common/efx_mac.c ============================================================================== --- head/sys/dev/sfxge/common/efx_mac.c Fri May 13 07:12:14 2016 (r299608) +++ head/sys/dev/sfxge/common/efx_mac.c Fri May 13 07:15:02 2016 (r299609) @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #if EFSYS_OPT_SIENA static __checkReturn efx_rc_t -falconsiena_mac_multicast_list_set( +siena_mac_multicast_list_set( __in efx_nic_t *enp); #endif /* EFSYS_OPT_SIENA */ @@ -50,7 +50,7 @@ static const efx_mac_ops_t __efx_siena_m siena_mac_reconfigure, /* emo_addr_set */ siena_mac_reconfigure, /* emo_pdu_set */ siena_mac_reconfigure, /* emo_reconfigure */ - falconsiena_mac_multicast_list_set, /* emo_multicast_list_set */ + siena_mac_multicast_list_set, /* emo_multicast_list_set */ NULL, /* emo_filter_set_default_rxq */ NULL, /* emo_filter_default_rxq_clear */ #if EFSYS_OPT_LOOPBACK @@ -764,7 +764,7 @@ fail1: /* Compute the multicast hash as used on Falcon and Siena. */ static void -falconsiena_mac_multicast_hash_compute( +siena_mac_multicast_hash_compute( __in_ecount(6*count) uint8_t const *addrs, __in int count, __out efx_oword_t *hash_low, @@ -794,7 +794,7 @@ falconsiena_mac_multicast_hash_compute( } static __checkReturn efx_rc_t -falconsiena_mac_multicast_list_set( +siena_mac_multicast_list_set( __in efx_nic_t *enp) { efx_port_t *epp = &(enp->en_port); @@ -807,10 +807,11 @@ falconsiena_mac_multicast_list_set( memcpy(old_hash, epp->ep_multicst_hash, sizeof (old_hash)); - falconsiena_mac_multicast_hash_compute(epp->ep_mulcst_addr_list, - epp->ep_mulcst_addr_count, - &epp->ep_multicst_hash[0], - &epp->ep_multicst_hash[1]); + siena_mac_multicast_hash_compute( + epp->ep_mulcst_addr_list, + epp->ep_mulcst_addr_count, + &epp->ep_multicst_hash[0], + &epp->ep_multicst_hash[1]); if ((rc = emop->emo_reconfigure(enp)) != 0) goto fail1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605130715.u4D7F28L040189>