From f72d3d239d75d80a70558b767c496d3658341504 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Mon, 16 Feb 2004 18:51:01 +0000
Subject: [PATCH] Add pci_get_ether and pci_set_ether for FreeBSD 5
 compatibility

---
 sys/bus/pci/pci.c    | 10 +++++++++-
 sys/bus/pci/pcivar.h |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c
index 0f2f98145e..dda6f41715 100644
--- a/sys/bus/pci/pci.c
+++ b/sys/bus/pci/pci.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/pci.c,v 1.141.2.15 2002/04/30 17:48:18 tmm Exp $
- * $DragonFly: src/sys/bus/pci/pci.c,v 1.15 2004/02/06 23:09:36 joerg Exp $
+ * $DragonFly: src/sys/bus/pci/pci.c,v 1.16 2004/02/16 18:51:01 joerg Exp $
  *
  */
 
@@ -1477,6 +1477,13 @@ pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
 	case PCI_IVAR_SUBORDINATEBUS:
 		*result = cfg->subordinatebus;
 		break;
+	case PCI_IVAR_ETHADDR:
+		/*
+		 * The generic accessor doesn't deal with failure, so
+		 * we set the return value, then return an error.
+		 */
+		*result = NULL;
+		return (EINVAL);
 	default:
 		return ENOENT;
 	}
@@ -1507,6 +1514,7 @@ pci_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
 	case PCI_IVAR_BUS:
 	case PCI_IVAR_SLOT:
 	case PCI_IVAR_FUNCTION:
+	case PCI_IVAR_ETHADDR:
 		return EINVAL;	/* disallow for now */
 
 	case PCI_IVAR_SECONDARYBUS:
diff --git a/sys/bus/pci/pcivar.h b/sys/bus/pci/pcivar.h
index 876f998f37..7d2e661344 100644
--- a/sys/bus/pci/pcivar.h
+++ b/sys/bus/pci/pcivar.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/pcivar.h,v 1.48 2000/09/28 00:37:32 peter Exp $
- * $DragonFly: src/sys/bus/pci/pcivar.h,v 1.6 2004/02/06 23:09:36 joerg Exp $
+ * $DragonFly: src/sys/bus/pci/pcivar.h,v 1.7 2004/02/16 18:51:01 joerg Exp $
  *
  */
 
@@ -234,6 +234,7 @@ PCI_ACCESSOR(slot,		SLOT,		u_int8_t)
 PCI_ACCESSOR(function,		FUNCTION,	u_int8_t)
 PCI_ACCESSOR(secondarybus,	SECONDARYBUS,	u_int8_t)
 PCI_ACCESSOR(subordinatebus,	SUBORDINATEBUS,	u_int8_t)
+PCI_ACCESSOR(ether,		ETHADDR,	uint8_t *)
 
 #undef PCI_ACCESSOR
 
-- 
2.35.2