| efx_mac.c (228078) | efx_mac.c (278839) |
|---|---|
| 1/*- 2 * Copyright 2007-2009 Solarflare Communications Inc. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions 6 * are met: 7 * 1. Redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer. --- 10 unchanged lines hidden (view full) --- 19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 23 * SUCH DAMAGE. 24 */ 25 26#include <sys/cdefs.h> | 1/*- 2 * Copyright 2007-2009 Solarflare Communications Inc. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions 6 * are met: 7 * 1. Redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer. --- 10 unchanged lines hidden (view full) --- 19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 23 * SUCH DAMAGE. 24 */ 25 26#include <sys/cdefs.h> |
| 27__FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_mac.c 228078 2011-11-28 17:19:05Z philip $"); | 27__FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_mac.c 278839 2015-02-16 06:12:04Z arybchik $"); |
| 28 29#include "efsys.h" 30#include "efx.h" 31#include "efx_types.h" 32#include "efx_impl.h" 33 34#if EFSYS_OPT_MAC_FALCON_GMAC 35#include "falcon_gmac.h" --- 628 unchanged lines hidden (view full) --- 664 665chosen: 666 EFSYS_ASSERT(type != EFX_MAC_INVALID); 667 EFSYS_ASSERT3U(type, <, EFX_MAC_NTYPES); 668 emop = epp->ep_emop = (efx_mac_ops_t *)__efx_mac_ops[type]; 669 EFSYS_ASSERT(emop != NULL); 670 671 epp->ep_mac_type = type; | 28 29#include "efsys.h" 30#include "efx.h" 31#include "efx_types.h" 32#include "efx_impl.h" 33 34#if EFSYS_OPT_MAC_FALCON_GMAC 35#include "falcon_gmac.h" --- 628 unchanged lines hidden (view full) --- 664 665chosen: 666 EFSYS_ASSERT(type != EFX_MAC_INVALID); 667 EFSYS_ASSERT3U(type, <, EFX_MAC_NTYPES); 668 emop = epp->ep_emop = (efx_mac_ops_t *)__efx_mac_ops[type]; 669 EFSYS_ASSERT(emop != NULL); 670 671 epp->ep_mac_type = type; |
| 672 | 672 |
| 673 if (emop->emo_reset != NULL) { 674 if ((rc = emop->emo_reset(enp)) != 0) 675 goto fail1; | 673 if (emop->emo_reset != NULL) { 674 if ((rc = emop->emo_reset(enp)) != 0) 675 goto fail1; |
| 676 | 676 |
| 677 EFSYS_ASSERT(enp->en_reset_flags & EFX_RESET_MAC); 678 enp->en_reset_flags &= ~EFX_RESET_MAC; 679 } 680 681 return (0); 682 683fail1: 684 EFSYS_PROBE1(fail1, int, rc); 685 686 return (rc); 687} | 677 EFSYS_ASSERT(enp->en_reset_flags & EFX_RESET_MAC); 678 enp->en_reset_flags &= ~EFX_RESET_MAC; 679 } 680 681 return (0); 682 683fail1: 684 EFSYS_PROBE1(fail1, int, rc); 685 686 return (rc); 687} |