diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2005-11-11 07:36:14 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2005-11-11 07:36:14 +0000 |
| commit | d09ed26fd80ce9c7bfbce9a4b89f352e610d8abc (patch) | |
| tree | 4d7e562715c0e571dbcf93217dd79abe8f2fb3dd /sys/dev/pdq | |
| parent | a0e82eba5d6abf7cff5971e4d6d72034020df8de (diff) | |
Notes
Diffstat (limited to 'sys/dev/pdq')
| -rw-r--r-- | sys/dev/pdq/if_fea.c | 5 | ||||
| -rw-r--r-- | sys/dev/pdq/if_fpa.c | 5 | ||||
| -rw-r--r-- | sys/dev/pdq/pdq_freebsd.h | 2 | ||||
| -rw-r--r-- | sys/dev/pdq/pdq_ifsubr.c | 4 |
4 files changed, 5 insertions, 11 deletions
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c index 68dbf139e5a2..19ba31e1d3dc 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 1cca08e668ae..c44409f4f704 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 ef38138ecc04..d6932fb5499e 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 409779a7df5d..68e13ba7a089 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 |