- Make IFP2ENADDR() a pointer to IF_LLADDR() rather than another

  copy of Ethernet address.

- Change iso88025_ifattach() and fddi_ifattach() to accept MAC
  address as an argument, similar to ether_ifattach(), to make
  this work.

4 files changed, 5 insertions, 11 deletions

diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index 68dbf13..19ba31e 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -43,7 +43,6 @@
 #include <sys/rman.h> 
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 #include <net/fddi.h>
 
@@ -243,9 +242,7 @@ pdq_eisa_attach (dev)
 		goto bad;
 	}
 
-	bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes,
-	      (caddr_t) IFP2ENADDR(sc->ifp), FDDI_ADDR_LEN);
-	pdq_ifattach(sc);
+	pdq_ifattach(sc, sc->sc_pdq->pdq_hwaddr.lanaddr_bytes);
 
 	return (0);
 bad:
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 1cca08e..c44409f 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h> 
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h> 
 #include <net/fddi.h>
 
@@ -166,9 +165,7 @@ pdq_pci_attach(device_t dev)
 	goto bad;
     }
 
-    bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes,
-	  (caddr_t) IFP2ENADDR(sc->ifp), FDDI_ADDR_LEN);
-    pdq_ifattach(sc);
+    pdq_ifattach(sc, sc->sc_pdq->pdq_hwaddr.lanaddr_bytes);
 
     return (0);
 bad:
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index ef38138..d6932fb 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -260,7 +260,7 @@ pdq_state_t	pdq_stop (pdq_t *pdq);
  * OS dependent functions provided by
  * pdq_ifsubr.c or pdq.c to the bus front ends
  */
-void		pdq_ifattach (pdq_softc_t *);
+void		pdq_ifattach (pdq_softc_t *, const pdq_uint8_t *);
 void		pdq_ifdetach (pdq_softc_t *);
 void		pdq_free (device_t);
 int		pdq_interrupt (pdq_t *pdq);
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 409779a..68e13ba 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -410,7 +410,7 @@ pdq_ifioctl(
 #endif
 
 void
-pdq_ifattach(pdq_softc_t *sc)
+pdq_ifattach(pdq_softc_t *sc, const pdq_uint8_t *llc)
 {
     struct ifnet *ifp;
 
@@ -441,7 +441,7 @@ pdq_ifattach(pdq_softc_t *sc)
     }
 #endif
   
-    fddi_ifattach(ifp, FDDI_BPF_SUPPORTED);
+    fddi_ifattach(ifp, llc, FDDI_BPF_SUPPORTED);
 }
 
 void