diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-08-12 16:57:00 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-08-12 16:57:00 +0000 |
| commit | 3c5fcedb64c93f83a5ebbd7c9051cdecf076b8f2 (patch) | |
| tree | 650821e5551a0b98c771c1fb0cca3910224a88cf /sys | |
| parent | c1f8a7de1a0cef9103fc122529d02253e13267ff (diff) | |
ix currently relies on a gcc extension that removes a comma
if no arguments are passed to a variadic macro.
Create a seperate non variadic macro for this fixed argument
case. No binary change.
ok reyk@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_ix.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/ixgbe_type.h | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c index 9a277f85ff5..49ba560e01d 100644 --- a/sys/dev/pci/if_ix.c +++ b/sys/dev/pci/if_ix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ix.c,v 1.27 2009/08/12 14:39:05 dlg Exp $ */ +/* $OpenBSD: if_ix.c,v 1.28 2009/08/12 16:56:59 jsg Exp $ */ /****************************************************************************** @@ -1125,9 +1125,9 @@ ixgbe_stop(void *arg) INIT_DEBUGOUT("ixgbe_stop: begin\n"); ixgbe_disable_intr(sc); - ixgbe_hw(&sc->hw, reset_hw); + ixgbe_hw0(&sc->hw, reset_hw); sc->hw.adapter_stopped = FALSE; - ixgbe_hw(&sc->hw, stop_adapter); + ixgbe_hw0(&sc->hw, stop_adapter); timeout_del(&sc->timer); /* reprogram the RAR[0] in case user changed it. */ @@ -1307,7 +1307,7 @@ ixgbe_hardware_init(struct ix_softc *sc) csum = 0; /* Issue a global reset */ sc->hw.adapter_stopped = FALSE; - ixgbe_hw(&sc->hw, stop_adapter); + ixgbe_hw0(&sc->hw, stop_adapter); /* Make sure we have a good EEPROM before we read from it */ if (ixgbe_ee(&sc->hw, validate_checksum, &csum) < 0) { @@ -1322,7 +1322,7 @@ ixgbe_hardware_init(struct ix_softc *sc) sc->hw.fc.high_water = IXGBE_FC_HI; sc->hw.fc.send_xon = TRUE; - if (ixgbe_hw(&sc->hw, init_hw) != 0) { + if (ixgbe_hw0(&sc->hw, init_hw) != 0) { printf("%s: Hardware Initialization Failed", ifp->if_xname); return (EIO); } diff --git a/sys/dev/pci/ixgbe_type.h b/sys/dev/pci/ixgbe_type.h index c4975a7c910..9a192fefd4f 100644 --- a/sys/dev/pci/ixgbe_type.h +++ b/sys/dev/pci/ixgbe_type.h @@ -1529,6 +1529,9 @@ struct ixgbe_hw { #define ixgbe_hw(hw, func, ...) \ ((hw)->mac.ops.func != NULL) ? \ (hw)->mac.ops.func(hw, ##__VA_ARGS__) : IXGBE_NOT_IMPLEMENTED +#define ixgbe_hw0(hw, func, ...) \ + ((hw)->mac.ops.func != NULL) ? \ + (hw)->mac.ops.func(hw) : IXGBE_NOT_IMPLEMENTED #define ixgbe_ee(hw, func, ...) \ ((hw)->eeprom.ops.func != NULL) ? \ (hw)->eeprom.ops.func(hw, ##__VA_ARGS__) : IXGBE_NOT_IMPLEMENTED |