Author: arybchik
Date: Wed Feb 18 06:26:07 2015
New Revision: 278942
URL: https://svnweb.freebsd.org/changeset/base/278942
Log:
sfxge: fix broken MCDI_EV_FIELD() macro
Submitted by: Andrew Lee <alee at solarflare.com>
Sponsored by: Solarflare Communications, Inc.
Approved by: gnn (mentor)
Modified:
head/sys/dev/sfxge/common/efx_ev.c
head/sys/dev/sfxge/common/efx_mcdi.h
head/sys/dev/sfxge/common/siena_phy.c
Modified: head/sys/dev/sfxge/common/efx_ev.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_ev.c Wed Feb 18 06:23:16 2015
(r278941)
+++ head/sys/dev/sfxge/common/efx_ev.c Wed Feb 18 06:26:07 2015
(r278942)
@@ -577,9 +577,9 @@ efx_ev_mcdi(
case MCDI_EVENT_CODE_CMDDONE:
efx_mcdi_ev_cpl(enp,
- MCDI_EV_FIELD(*eqp, CMDDONE_SEQ),
- MCDI_EV_FIELD(*eqp, CMDDONE_DATALEN),
- MCDI_EV_FIELD(*eqp, CMDDONE_ERRNO));
+ MCDI_EV_FIELD(eqp, CMDDONE_SEQ),
+ MCDI_EV_FIELD(eqp, CMDDONE_DATALEN),
+ MCDI_EV_FIELD(eqp, CMDDONE_ERRNO));
break;
case MCDI_EVENT_CODE_LINKCHANGE: {
Modified: head/sys/dev/sfxge/common/efx_mcdi.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_mcdi.h Wed Feb 18 06:23:16 2015
(r278941)
+++ head/sys/dev/sfxge/common/efx_mcdi.h Wed Feb 18 06:26:07 2015
(r278942)
@@ -231,7 +231,7 @@ efx_mcdi_version(
MC_CMD_ ## _field)
#define MCDI_EV_FIELD(_eqp, _field)
\
- EFX_QWORD_FIELD(*eqp, MCDI_EVENT_ ## _field)
+ EFX_QWORD_FIELD(*_eqp, MCDI_EVENT_ ## _field)
#ifdef __cplusplus
}
Modified: head/sys/dev/sfxge/common/siena_phy.c
==============================================================================
--- head/sys/dev/sfxge/common/siena_phy.c Wed Feb 18 06:23:16 2015
(r278941)
+++ head/sys/dev/sfxge/common/siena_phy.c Wed Feb 18 06:26:07 2015
(r278942)
@@ -122,7 +122,7 @@ siena_phy_link_ev(
* Convert the LINKCHANGE speed enumeration into mbit/s, in the
* same way as GET_LINK encodes the speed
*/
- switch (MCDI_EV_FIELD(*eqp, LINKCHANGE_SPEED)) {
+ switch (MCDI_EV_FIELD(eqp, LINKCHANGE_SPEED)) {
case MCDI_EVENT_LINKCHANGE_SPEED_100M:
speed = 100;
break;
@@ -137,11 +137,11 @@ siena_phy_link_ev(
break;
}
- link_flags = MCDI_EV_FIELD(*eqp, LINKCHANGE_LINK_FLAGS);
+ link_flags = MCDI_EV_FIELD(eqp, LINKCHANGE_LINK_FLAGS);
siena_phy_decode_link_mode(enp, link_flags, speed,
- MCDI_EV_FIELD(*eqp, LINKCHANGE_FCNTL),
+ MCDI_EV_FIELD(eqp, LINKCHANGE_FCNTL),
&link_mode, &fcntl);
- siena_phy_decode_cap(MCDI_EV_FIELD(*eqp, LINKCHANGE_LP_CAP),
+ siena_phy_decode_cap(MCDI_EV_FIELD(eqp, LINKCHANGE_LP_CAP),
&lp_cap_mask);
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
