Author: arybchik
Date: Thu Jan 14 14:23:38 2016
New Revision: 293934
URL: https://svnweb.freebsd.org/changeset/base/293934
Log:
MFC r291585
sfxge: support MAC spoofing for 4.2.x firmare
Common code should infer other privileges from Admin privilege to
support firmware that pre-dates introduction of specific privilege
flags.
Submitted by: Richard Houldsworth <rhouldsworth at solarflare.com>
Sponsored by: Solarflare Communications, Inc.
Modified:
stable/10/sys/dev/sfxge/common/hunt_mcdi.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sfxge/common/hunt_mcdi.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_mcdi.c Thu Jan 14 14:22:16 2016
(r293933)
+++ stable/10/sys/dev/sfxge/common/hunt_mcdi.c Thu Jan 14 14:23:38 2016
(r293934)
@@ -435,7 +435,11 @@ hunt_mcdi_fw_update_supported(
EFSYS_ASSERT3U(enp->en_family, ==, EFX_FAMILY_HUNTINGTON);
- /* use privilege mask state at MCDI attach */
+ /*
+ * Use privilege mask state at MCDI attach.
+ * Admin privilege must be used prior to introduction of
+ * specific flag.
+ */
*supportedp = (encp->enc_privilege_mask &
MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN)
== MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN;
@@ -449,13 +453,20 @@ hunt_mcdi_macaddr_change_supported(
__out boolean_t *supportedp)
{
efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
+ uint32_t privilege_mask = encp->enc_privilege_mask;
EFSYS_ASSERT3U(enp->en_family, ==, EFX_FAMILY_HUNTINGTON);
- /* use privilege mask state at MCDI attach */
- *supportedp = (encp->enc_privilege_mask &
- MC_CMD_PRIVILEGE_MASK_IN_GRP_MAC_SPOOFING)
- == MC_CMD_PRIVILEGE_MASK_IN_GRP_MAC_SPOOFING;
+ /*
+ * Use privilege mask state at MCDI attach.
+ * Admin privilege must be used prior to introduction of
+ * specific flag (at v4.6).
+ */
+ *supportedp =
+ ((privilege_mask & MC_CMD_PRIVILEGE_MASK_IN_GRP_MAC_SPOOFING) ==
+ MC_CMD_PRIVILEGE_MASK_IN_GRP_MAC_SPOOFING) ||
+ ((privilege_mask & MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN) ==
+ MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN);
return (0);
}
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
