diff options
author | ru <ru@FreeBSD.org> | 2005-11-11 12:17:31 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2005-11-11 12:17:31 +0000 |
commit | ec1697067958cd5395dc4db2ef0cb1ce54dc746e (patch) | |
tree | 0661ceef4cecc549393ddd1aff0d169d386cb8b6 | |
parent | 24afcaae818a704f924f89cd18fcd660e2a72204 (diff) | |
download | FreeBSD-src-ec1697067958cd5395dc4db2ef0cb1ce54dc746e.zip FreeBSD-src-ec1697067958cd5395dc4db2ef0cb1ce54dc746e.tar.gz |
Catch up with IFP2ENADDR() type change (array -> pointer).
-rw-r--r-- | sys/dev/ex/if_ex.c | 2 | ||||
-rw-r--r-- | sys/dev/fxp/if_fxp.c | 3 | ||||
-rw-r--r-- | sys/dev/owi/if_owi.c | 4 | ||||
-rw-r--r-- | sys/dev/wl/if_wl.c | 2 | ||||
-rw-r--r-- | sys/dev/xe/if_xe.c | 2 | ||||
-rw-r--r-- | sys/netatalk/aarp.c | 3 | ||||
-rw-r--r-- | sys/pci/if_tl.c | 2 | ||||
-rw-r--r-- | sys/pci/if_xl.c | 4 |
8 files changed, 10 insertions, 12 deletions
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c index 3c1296f..24425b6 100644 --- a/sys/dev/ex/if_ex.c +++ b/sys/dev/ex/if_ex.c @@ -892,7 +892,7 @@ ex_setmulti(struct ex_softc *sc) /* Program our MAC address as well */ /* XXX: Is this necessary? The Linux driver does this * but the NetBSD driver does not */ - addr = (uint16_t*)(&IFP2ENADDR(sc->ifp)); + addr = (uint16_t*)(IFP2ENADDR(sc->ifp)); CSR_WRITE_2(sc, IO_PORT_REG, *addr++); CSR_WRITE_2(sc, IO_PORT_REG, *addr++); CSR_WRITE_2(sc, IO_PORT_REG, *addr++); diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 638c8df..428fd53 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -2087,8 +2087,7 @@ fxp_init_body(struct fxp_softc *sc) cb_ias->cb_status = 0; cb_ias->cb_command = htole16(FXP_CB_COMMAND_IAS | FXP_CB_COMMAND_EL); cb_ias->link_addr = 0xffffffff; - bcopy(IFP2ENADDR(sc->ifp), cb_ias->macaddr, - sizeof(IFP2ENADDR(sc->ifp))); + bcopy(IFP2ENADDR(sc->ifp), cb_ias->macaddr, ETHER_ADDR_LEN); /* * Start the IAS (Individual Address Setup) command/DMA. diff --git a/sys/dev/owi/if_owi.c b/sys/dev/owi/if_owi.c index 349d85e..d788091 100644 --- a/sys/dev/owi/if_owi.c +++ b/sys/dev/owi/if_owi.c @@ -1245,7 +1245,7 @@ wi_setdef(sc, wreq) switch(wreq->wi_type) { case WI_RID_MAC_NODE: - bcopy((char *)&wreq->wi_val, (char *)&IFP2ENADDR(sc->ifp), + bcopy((char *)&wreq->wi_val, (char *)IFP2ENADDR(sc->ifp), ETHER_ADDR_LEN); break; case WI_RID_PORTTYPE: @@ -1749,7 +1749,7 @@ wi_init(xsc) /* Set our MAC address. */ mac.wi_len = 4; mac.wi_type = WI_RID_MAC_NODE; - bcopy((char *)&IFP2ENADDR(sc->ifp), + bcopy((char *)IFP2ENADDR(sc->ifp), (char *)&mac.wi_mac_addr, ETHER_ADDR_LEN); wi_write_record(sc, (struct wi_ltv_gen *)&mac); diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index 0df46ca..4fb27ed 100644 --- a/sys/dev/wl/if_wl.c +++ b/sys/dev/wl/if_wl.c @@ -1192,7 +1192,7 @@ wlread(struct wl_softc *sc, u_short fd_p) #endif && (eh->ether_dhost[0] & 1) == 0 && /* !mcast and !bcast */ - bcmp(eh->ether_dhost, &IFP2ENADDR(sc->ifp), + bcmp(eh->ether_dhost, IFP2ENADDR(sc->ifp), sizeof(eh->ether_dhost)) != 0 ) { m_freem(m); return 1; diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c index 54d3cdc..303036f 100644 --- a/sys/dev/xe/if_xe.c +++ b/sys/dev/xe/if_xe.c @@ -1309,7 +1309,7 @@ xe_set_multicast(struct xe_softc *scp) { else if (count < 10) { /* Full in any unused Individual Addresses with our MAC address */ for (i = count + 1; i < 10; i++) - xe_set_addr(scp, (u_int8_t *)(&IFP2ENADDR(scp->ifp)), i); + xe_set_addr(scp, (u_int8_t *)(IFP2ENADDR(scp->ifp)), i); /* Enable Individual Address matching only */ XE_SELECT_PAGE(0x42); XE_OUTB(XE_SWC1, (XE_INB(XE_SWC1) & ~XE_SWC1_ALLMULTI) | XE_SWC1_IA_ENABLE); diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c index 6806491..50c5ced 100644 --- a/sys/netatalk/aarp.c +++ b/sys/netatalk/aarp.c @@ -360,8 +360,7 @@ at_aarpinput(struct ifnet *ifp, struct mbuf *m) ea = mtod(m, struct ether_aarp *); /* Check to see if from my hardware address */ - if (!bcmp((caddr_t)ea->aarp_sha, IFP2ENADDR(ifp), - sizeof(IFP2ENADDR(ifp)))) { + if (!bcmp((caddr_t)ea->aarp_sha, IFP2ENADDR(ifp), ETHER_ADDR_LEN)) { m_freem(m); return; } diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c index e4592a9..babd1ae 100644 --- a/sys/pci/if_tl.c +++ b/sys/pci/if_tl.c @@ -2091,7 +2091,7 @@ tl_init_locked(sc) tl_dio_write16(sc, TL_MAXRX, MCLBYTES); /* Init our MAC address */ - tl_setfilt(sc, (caddr_t)&IFP2ENADDR(sc->tl_ifp), 0); + tl_setfilt(sc, (caddr_t)IFP2ENADDR(sc->tl_ifp), 0); /* Init multicast filter, if needed. */ tl_setmulti(sc); diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index 51e143b..37aab4e 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -857,9 +857,9 @@ xl_testpacket(struct xl_softc *sc) if (m == NULL) return; - bcopy(&IFP2ENADDR(sc->xl_ifp), + bcopy(IFP2ENADDR(sc->xl_ifp), mtod(m, struct ether_header *)->ether_dhost, ETHER_ADDR_LEN); - bcopy(&IFP2ENADDR(sc->xl_ifp), + bcopy(IFP2ENADDR(sc->xl_ifp), mtod(m, struct ether_header *)->ether_shost, ETHER_ADDR_LEN); mtod(m, struct ether_header *)->ether_type = htons(3); mtod(m, unsigned char *)[14] = 0; |