From owner-svn-src-all@freebsd.org Fri May 13 07:15:52 2016 Return-Path: Delivered-To: svn-src-all@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 62722B39AD1; Fri, 13 May 2016 07:15:52 +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 3E21A1CDC; Fri, 13 May 2016 07:15:52 +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 u4D7FpU6040257; Fri, 13 May 2016 07:15:51 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4D7Fpen040256; Fri, 13 May 2016 07:15:51 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201605130715.u4D7Fpen040256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Fri, 13 May 2016 07:15:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299610 - head/sys/dev/sfxge/common X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2016 07:15:52 -0000 Author: arybchik Date: Fri May 13 07:15:51 2016 New Revision: 299610 URL: https://svnweb.freebsd.org/changeset/base/299610 Log: sfxge(4): rename falconsiena_rx_* Falcon support has been removed, so this code only supports Siena. Submitted by: Andy Moreton Sponsored by: Solarflare Communications, Inc. MFC after: 1 week Modified: head/sys/dev/sfxge/common/efx_rx.c Modified: head/sys/dev/sfxge/common/efx_rx.c ============================================================================== --- head/sys/dev/sfxge/common/efx_rx.c Fri May 13 07:15:02 2016 (r299609) +++ head/sys/dev/sfxge/common/efx_rx.c Fri May 13 07:15:51 2016 (r299610) @@ -38,42 +38,42 @@ __FBSDID("$FreeBSD$"); #if EFSYS_OPT_SIENA static __checkReturn efx_rc_t -falconsiena_rx_init( +siena_rx_init( __in efx_nic_t *enp); static void -falconsiena_rx_fini( +siena_rx_fini( __in efx_nic_t *enp); #if EFSYS_OPT_RX_SCATTER static __checkReturn efx_rc_t -falconsiena_rx_scatter_enable( +siena_rx_scatter_enable( __in efx_nic_t *enp, __in unsigned int buf_size); #endif /* EFSYS_OPT_RX_SCATTER */ #if EFSYS_OPT_RX_SCALE static __checkReturn efx_rc_t -falconsiena_rx_scale_mode_set( +siena_rx_scale_mode_set( __in efx_nic_t *enp, __in efx_rx_hash_alg_t alg, __in efx_rx_hash_type_t type, __in boolean_t insert); static __checkReturn efx_rc_t -falconsiena_rx_scale_key_set( +siena_rx_scale_key_set( __in efx_nic_t *enp, __in_ecount(n) uint8_t *key, __in size_t n); static __checkReturn efx_rc_t -falconsiena_rx_scale_tbl_set( +siena_rx_scale_tbl_set( __in efx_nic_t *enp, __in_ecount(n) unsigned int *table, __in size_t n); static __checkReturn uint32_t -falconsiena_rx_prefix_hash( +siena_rx_prefix_hash( __in efx_nic_t *enp, __in efx_rx_hash_alg_t func, __in uint8_t *buffer); @@ -81,13 +81,13 @@ falconsiena_rx_prefix_hash( #endif /* EFSYS_OPT_RX_SCALE */ static __checkReturn efx_rc_t -falconsiena_rx_prefix_pktlen( +siena_rx_prefix_pktlen( __in efx_nic_t *enp, __in uint8_t *buffer, __out uint16_t *lengthp); static void -falconsiena_rx_qpost( +siena_rx_qpost( __in efx_rxq_t *erp, __in_ecount(n) efsys_dma_addr_t *addrp, __in size_t size, @@ -96,21 +96,21 @@ falconsiena_rx_qpost( __in unsigned int added); static void -falconsiena_rx_qpush( +siena_rx_qpush( __in efx_rxq_t *erp, __in unsigned int added, __inout unsigned int *pushedp); static __checkReturn efx_rc_t -falconsiena_rx_qflush( +siena_rx_qflush( __in efx_rxq_t *erp); static void -falconsiena_rx_qenable( +siena_rx_qenable( __in efx_rxq_t *erp); static __checkReturn efx_rc_t -falconsiena_rx_qcreate( +siena_rx_qcreate( __in efx_nic_t *enp, __in unsigned int index, __in unsigned int label, @@ -122,7 +122,7 @@ falconsiena_rx_qcreate( __in efx_rxq_t *erp); static void -falconsiena_rx_qdestroy( +siena_rx_qdestroy( __in efx_rxq_t *erp); #endif /* EFSYS_OPT_SIENA */ @@ -130,24 +130,24 @@ falconsiena_rx_qdestroy( #if EFSYS_OPT_SIENA static const efx_rx_ops_t __efx_rx_siena_ops = { - falconsiena_rx_init, /* erxo_init */ - falconsiena_rx_fini, /* erxo_fini */ + siena_rx_init, /* erxo_init */ + siena_rx_fini, /* erxo_fini */ #if EFSYS_OPT_RX_SCATTER - falconsiena_rx_scatter_enable, /* erxo_scatter_enable */ + siena_rx_scatter_enable, /* erxo_scatter_enable */ #endif #if EFSYS_OPT_RX_SCALE - falconsiena_rx_scale_mode_set, /* erxo_scale_mode_set */ - falconsiena_rx_scale_key_set, /* erxo_scale_key_set */ - falconsiena_rx_scale_tbl_set, /* erxo_scale_tbl_set */ - falconsiena_rx_prefix_hash, /* erxo_prefix_hash */ + siena_rx_scale_mode_set, /* erxo_scale_mode_set */ + siena_rx_scale_key_set, /* erxo_scale_key_set */ + siena_rx_scale_tbl_set, /* erxo_scale_tbl_set */ + siena_rx_prefix_hash, /* erxo_prefix_hash */ #endif - falconsiena_rx_prefix_pktlen, /* erxo_prefix_pktlen */ - falconsiena_rx_qpost, /* erxo_qpost */ - falconsiena_rx_qpush, /* erxo_qpush */ - falconsiena_rx_qflush, /* erxo_qflush */ - falconsiena_rx_qenable, /* erxo_qenable */ - falconsiena_rx_qcreate, /* erxo_qcreate */ - falconsiena_rx_qdestroy, /* erxo_qdestroy */ + siena_rx_prefix_pktlen, /* erxo_prefix_pktlen */ + siena_rx_qpost, /* erxo_qpost */ + siena_rx_qpush, /* erxo_qpush */ + siena_rx_qflush, /* erxo_qflush */ + siena_rx_qenable, /* erxo_qenable */ + siena_rx_qcreate, /* erxo_qcreate */ + siena_rx_qdestroy, /* erxo_qdestroy */ }; #endif /* EFSYS_OPT_SIENA */ @@ -567,7 +567,7 @@ efx_psuedo_hdr_hash_get( #if EFSYS_OPT_SIENA static __checkReturn efx_rc_t -falconsiena_rx_init( +siena_rx_init( __in efx_nic_t *enp) { efx_oword_t oword; @@ -604,7 +604,7 @@ falconsiena_rx_init( #if EFSYS_OPT_RX_SCATTER static __checkReturn efx_rc_t -falconsiena_rx_scatter_enable( +siena_rx_scatter_enable( __in efx_nic_t *enp, __in unsigned int buf_size) { @@ -710,7 +710,7 @@ fail1: #if EFSYS_OPT_RX_SCALE static __checkReturn efx_rc_t -falconsiena_rx_scale_mode_set( +siena_rx_scale_mode_set( __in efx_nic_t *enp, __in efx_rx_hash_alg_t alg, __in efx_rx_hash_type_t type, @@ -757,7 +757,7 @@ fail1: #if EFSYS_OPT_RX_SCALE static __checkReturn efx_rc_t -falconsiena_rx_scale_key_set( +siena_rx_scale_key_set( __in efx_nic_t *enp, __in_ecount(n) uint8_t *key, __in size_t n) @@ -882,7 +882,7 @@ fail1: #if EFSYS_OPT_RX_SCALE static __checkReturn efx_rc_t -falconsiena_rx_scale_tbl_set( +siena_rx_scale_tbl_set( __in efx_nic_t *enp, __in_ecount(n) unsigned int *table, __in size_t n) @@ -960,7 +960,7 @@ fail1: #if EFSYS_OPT_RX_SCALE static __checkReturn uint32_t -falconsiena_rx_prefix_hash( +siena_rx_prefix_hash( __in efx_nic_t *enp, __in efx_rx_hash_alg_t func, __in uint8_t *buffer) @@ -983,7 +983,7 @@ falconsiena_rx_prefix_hash( #endif /* EFSYS_OPT_RX_SCALE */ static __checkReturn efx_rc_t -falconsiena_rx_prefix_pktlen( +siena_rx_prefix_pktlen( __in efx_nic_t *enp, __in uint8_t *buffer, __out uint16_t *lengthp) @@ -995,7 +995,7 @@ falconsiena_rx_prefix_pktlen( static void -falconsiena_rx_qpost( +siena_rx_qpost( __in efx_rxq_t *erp, __in_ecount(n) efsys_dma_addr_t *addrp, __in size_t size, @@ -1033,7 +1033,7 @@ falconsiena_rx_qpost( } static void -falconsiena_rx_qpush( +siena_rx_qpush( __in efx_rxq_t *erp, __in unsigned int added, __inout unsigned int *pushedp) @@ -1065,7 +1065,7 @@ falconsiena_rx_qpush( } static __checkReturn efx_rc_t -falconsiena_rx_qflush( +siena_rx_qflush( __in efx_rxq_t *erp) { efx_nic_t *enp = erp->er_enp; @@ -1083,7 +1083,7 @@ falconsiena_rx_qflush( } static void -falconsiena_rx_qenable( +siena_rx_qenable( __in efx_rxq_t *erp) { efx_nic_t *enp = erp->er_enp; @@ -1103,7 +1103,7 @@ falconsiena_rx_qenable( } static __checkReturn efx_rc_t -falconsiena_rx_qcreate( +siena_rx_qcreate( __in efx_nic_t *enp, __in unsigned int index, __in unsigned int label, @@ -1193,7 +1193,7 @@ fail1: } static void -falconsiena_rx_qdestroy( +siena_rx_qdestroy( __in efx_rxq_t *erp) { efx_nic_t *enp = erp->er_enp; @@ -1213,7 +1213,7 @@ falconsiena_rx_qdestroy( } static void -falconsiena_rx_fini( +siena_rx_fini( __in efx_nic_t *enp) { _NOTE(ARGUNUSED(enp))