svn commit: r342495 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Wed Dec 26 10:03:59 2018
New Revision: 342495
URL: https://svnweb.freebsd.org/changeset/base/342495

Log:
  MFC r340875
  
  sfxge(4): fix build issue with PHY LED control enabled
  
  Fixed build issue with the EFSYS_OPT_PHY_LED_CONTROL for Huntigton and
  Medford.
  
  Submitted by:   Vijay Srivastava <vijays at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D18110

Modified:
  stable/10/sys/dev/sfxge/common/ef10_phy.c
  stable/10/sys/dev/sfxge/common/efx_check.h
  stable/10/sys/dev/sfxge/common/siena_nic.c
  stable/10/sys/dev/sfxge/common/siena_phy.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/ef10_phy.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/ef10_phy.c	Wed Dec 26 10:03:11 2018	(r342494)
+++ stable/10/sys/dev/sfxge/common/ef10_phy.c	Wed Dec 26 10:03:59 2018	(r342495)
@@ -283,7 +283,9 @@ ef10_phy_reconfigure(
 	uint8_t payload[MAX(MC_CMD_SET_LINK_IN_LEN,
 			    MC_CMD_SET_LINK_OUT_LEN)];
 	uint32_t cap_mask;
+#if EFSYS_OPT_PHY_LED_CONTROL
 	unsigned int led_mode;
+#endif
 	unsigned int speed;
 	boolean_t supported;
 	efx_rc_t rc;

Modified: stable/10/sys/dev/sfxge/common/efx_check.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_check.h	Wed Dec 26 10:03:11 2018	(r342494)
+++ stable/10/sys/dev/sfxge/common/efx_check.h	Wed Dec 26 10:03:59 2018	(r342495)
@@ -226,8 +226,8 @@
 
 /* Support for PHY LED control */
 #if EFSYS_OPT_PHY_LED_CONTROL
-# if !EFSYS_OPT_SIENA
-#  error "PHY_LED_CONTROL requires SIENA"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+#  error "PHY_LED_CONTROL requires SIENA or HUNTINGTON or MEDFORD"
 # endif
 #endif /* EFSYS_OPT_PHY_LED_CONTROL */
 

Modified: stable/10/sys/dev/sfxge/common/siena_nic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_nic.c	Wed Dec 26 10:03:11 2018	(r342494)
+++ stable/10/sys/dev/sfxge/common/siena_nic.c	Wed Dec 26 10:03:59 2018	(r342495)
@@ -188,7 +188,9 @@ static	__checkReturn	efx_rc_t
 siena_phy_cfg(
 	__in		efx_nic_t *enp)
 {
+#if EFSYS_OPT_PHY_STATS
 	efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
+#endif	/* EFSYS_OPT_PHY_STATS */
 	efx_rc_t rc;
 
 	/* Fill out fields in enp->en_port and enp->en_nic_cfg from MCDI */

Modified: stable/10/sys/dev/sfxge/common/siena_phy.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_phy.c	Wed Dec 26 10:03:11 2018	(r342494)
+++ stable/10/sys/dev/sfxge/common/siena_phy.c	Wed Dec 26 10:03:59 2018	(r342495)
@@ -276,7 +276,9 @@ siena_phy_reconfigure(
 			    MAX(MC_CMD_SET_LINK_IN_LEN,
 				MC_CMD_SET_LINK_OUT_LEN))];
 	uint32_t cap_mask;
+#if EFSYS_OPT_PHY_LED_CONTROL
 	unsigned int led_mode;
+#endif
 	unsigned int speed;
 	efx_rc_t rc;