Page MenuHomeFreeBSD
Files F152898448

D4455.id.diff
No OneTemporary
Actions

D4455.id.diff
View Options

Index: head/sys/dev/sfxge/common/efx_mcdi.h
===================================================================
--- head/sys/dev/sfxge/common/efx_mcdi.h
+++ head/sys/dev/sfxge/common/efx_mcdi.h
@@ -386,6 +386,11 @@
#define MCDI_CMD_DWORD_FIELD(_edp, _field) \
EFX_DWORD_FIELD(*_edp, MC_CMD_ ## _field)
+#define EFX_MCDI_HAVE_PRIVILEGE(mask, priv) \
+ (((mask) & \
+ (MC_CMD_PRIVILEGE_MASK_IN_GRP_ ## priv)) == \
+ (MC_CMD_PRIVILEGE_MASK_IN_GRP_ ## priv))
+
#ifdef __cplusplus
}
#endif
Index: head/sys/dev/sfxge/common/hunt_mcdi.c
===================================================================
--- head/sys/dev/sfxge/common/hunt_mcdi.c
+++ head/sys/dev/sfxge/common/hunt_mcdi.c
@@ -412,9 +412,8 @@
* 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;
+ *supportedp =
+ EFX_MCDI_HAVE_PRIVILEGE(encp->enc_privilege_mask, ADMIN);
return (0);
}
@@ -436,12 +435,9 @@
* introduction of change mac spoofing privilege (at v4.7)
*/
*supportedp =
- ((privilege_mask & MC_CMD_PRIVILEGE_MASK_IN_GRP_CHANGE_MAC) ==
- MC_CMD_PRIVILEGE_MASK_IN_GRP_CHANGE_MAC) ||
- ((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);
+ EFX_MCDI_HAVE_PRIVILEGE(privilege_mask, CHANGE_MAC) ||
+ EFX_MCDI_HAVE_PRIVILEGE(privilege_mask, MAC_SPOOFING) ||
+ EFX_MCDI_HAVE_PRIVILEGE(privilege_mask, ADMIN);
return (0);
}
@@ -463,12 +459,9 @@
* introduction of mac spoofing TX privilege (at v4.7)
*/
*supportedp =
- ((privilege_mask & MC_CMD_PRIVILEGE_MASK_IN_GRP_MAC_SPOOFING_TX) ==
- MC_CMD_PRIVILEGE_MASK_IN_GRP_MAC_SPOOFING_TX) ||
- ((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);
+ EFX_MCDI_HAVE_PRIVILEGE(privilege_mask, MAC_SPOOFING_TX) ||
+ EFX_MCDI_HAVE_PRIVILEGE(privilege_mask, MAC_SPOOFING) ||
+ EFX_MCDI_HAVE_PRIVILEGE(privilege_mask, ADMIN);
return (0);
}
@@ -490,10 +483,8 @@
* specific flag.
*/
*supportedp =
- ((privilege_mask & MC_CMD_PRIVILEGE_MASK_IN_GRP_LINK) ==
- MC_CMD_PRIVILEGE_MASK_IN_GRP_LINK) ||
- ((privilege_mask & MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN) ==
- MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN);
+ EFX_MCDI_HAVE_PRIVILEGE(privilege_mask, LINK) ||
+ EFX_MCDI_HAVE_PRIVILEGE(privilege_mask, ADMIN);
return (0);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 18, 9:31 PM (5 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31734284
Default Alt Text
D4455.id.diff (2 KB)

Event Timeline