diff options
| author | dyoung <dyoung@NetBSD.org> | 2007-08-26 22:45:55 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2007-08-26 22:45:55 +0000 |
| commit | 71e77a61b4d5bacea330af7dfd691c6d12988b95 (patch) | |
| tree | 3122d844b6aa118b7274f28b7e4388c08ac0ac3e /sys/dev | |
| parent | f004b71d982577c719d4342c2e0d053881dd7dc6 (diff) | |
Constify: LLADDR -> CLLADDR. I'm aiming here to make it easier to
identify sockaddr_dl abuse that remains in the kernel, especially
the potential for overwriting memory past the end of a sockaddr_dl
with, e.g., memcpy(LLADDR(), ...).
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/awi.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/dp8390.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/dp83932.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/elinkxl.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/gem.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/i82557.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/i82596.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/rt2560.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/rt2661.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/rtl81x9.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/seeq8005.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/tulip.c | 10 | ||||
| -rw-r--r-- | sys/dev/if_ndis/if_ndis.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/if_el.c | 6 | ||||
| -rw-r--r-- | sys/dev/isa/if_iy.c | 6 | ||||
| -rw-r--r-- | sys/dev/marvell/if_gfe.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/cxgb_l2t.c | 3 | ||||
| -rw-r--r-- | sys/dev/pci/if_bge.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/if_dge.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwi.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_ste.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_stge.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_wm.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 6 | ||||
| -rw-r--r-- | sys/dev/qbus/if_il.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/if_rum.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/if_ural.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/if_zyd.c | 6 |
28 files changed, 91 insertions, 93 deletions
diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c index 6558264270f..e47befdc2ff 100644 --- a/sys/dev/ic/awi.c +++ b/sys/dev/ic/awi.c @@ -1,4 +1,4 @@ -/* $NetBSD: awi.c,v 1.74 2007/03/04 06:01:51 christos Exp $ */ +/* $NetBSD: awi.c,v 1.75 2007/08/26 22:45:55 dyoung Exp $ */ /*- * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc. @@ -86,7 +86,7 @@ #include <sys/cdefs.h> #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.74 2007/03/04 06:01:51 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.75 2007/08/26 22:45:55 dyoung Exp $"); #endif #ifdef __FreeBSD__ __FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.30 2004/01/15 13:30:06 onoe Exp $"); @@ -590,7 +590,7 @@ awi_init(struct ifnet *ifp) return ENODEV; } #if 0 - IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl)); + IEEE80211_ADDR_COPY(ic->ic_myaddr, CLLADDR(ifp->if_sadl)); #endif memset(&sc->sc_mib_mac.aDesired_ESS_ID, 0, AWI_ESS_ID_SIZE); sc->sc_mib_mac.aDesired_ESS_ID[0] = IEEE80211_ELEMID_SSID; @@ -1135,7 +1135,7 @@ awi_mode_init(struct awi_softc *sc) if (n == AWI_GROUP_ADDR_SIZE) goto set_mib; IEEE80211_ADDR_COPY(sc->sc_mib_addr.aGroup_Addresses[n], - LLADDR((struct sockaddr_dl *)ifma->ifma_addr)); + CLLADDR(satocsdl(ifma->ifma_addr))); n++; } #else diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c index 855b5cbc7bd..78294e6d28c 100644 --- a/sys/dev/ic/dp8390.c +++ b/sys/dev/ic/dp8390.c @@ -1,4 +1,4 @@ -/* $NetBSD: dp8390.c,v 1.63 2007/03/04 06:01:54 christos Exp $ */ +/* $NetBSD: dp8390.c,v 1.64 2007/08/26 22:45:55 dyoung Exp $ */ /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -14,7 +14,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.63 2007/03/04 06:01:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.64 2007/08/26 22:45:55 dyoung Exp $"); #include "opt_ipkdb.h" #include "opt_inet.h" @@ -350,7 +350,7 @@ dp8390_init(sc) /* Copy out our station address. */ for (i = 0; i < ETHER_ADDR_LEN; ++i) NIC_PUT(regt, regh, ED_P1_PAR0 + i, - LLADDR(ifp->if_sadl)[i]); + CLLADDR(ifp->if_sadl)[i]); /* Set multicast filter on chip. */ dp8390_getmcaf(&sc->sc_ec, mcaf); diff --git a/sys/dev/ic/dp83932.c b/sys/dev/ic/dp83932.c index f6b13469814..b3754652c47 100644 --- a/sys/dev/ic/dp83932.c +++ b/sys/dev/ic/dp83932.c @@ -1,4 +1,4 @@ -/* $NetBSD: dp83932.c,v 1.17 2007/06/08 17:08:46 tsutsui Exp $ */ +/* $NetBSD: dp83932.c,v 1.18 2007/08/26 22:45:55 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.17 2007/06/08 17:08:46 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.18 2007/08/26 22:45:55 dyoung Exp $"); #include "bpfilter.h" @@ -1194,7 +1194,7 @@ sonic_set_filter(struct sonic_softc *sc) } /* Put our station address in the first CAM slot. */ - sonic_set_camentry(sc, entry, LLADDR(ifp->if_sadl)); + sonic_set_camentry(sc, entry, CLLADDR(ifp->if_sadl)); camvalid |= (1U << entry); entry++; diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c index 55705612245..0c1268c630c 100644 --- a/sys/dev/ic/elinkxl.c +++ b/sys/dev/ic/elinkxl.c @@ -1,4 +1,4 @@ -/* $NetBSD: elinkxl.c,v 1.97 2007/07/09 21:00:35 ad Exp $ */ +/* $NetBSD: elinkxl.c,v 1.98 2007/08/26 22:45:55 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.97 2007/07/09 21:00:35 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.98 2007/08/26 22:45:55 dyoung Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -677,7 +677,7 @@ ex_init(ifp) */ for (i = 0; i < ETHER_ADDR_LEN; i++) { bus_space_write_1(iot, ioh, ELINK_W2_ADDR_0 + i, - LLADDR(ifp->if_sadl)[i]); + CLLADDR(ifp->if_sadl)[i]); bus_space_write_1(iot, ioh, ELINK_W2_RECVMASK_0 + i, 0); } diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c index a1522933b12..dbd21dd405e 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $NetBSD: gem.c,v 1.57 2007/07/09 21:00:35 ad Exp $ */ +/* $NetBSD: gem.c,v 1.58 2007/08/26 22:45:56 dyoung Exp $ */ /* * @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.57 2007/07/09 21:00:35 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.58 2007/08/26 22:45:56 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -929,7 +929,7 @@ gem_init_regs(struct gem_softc *sc) struct ifnet *ifp = &sc->sc_ethercom.ec_if; bus_space_tag_t t = sc->sc_bustag; bus_space_handle_t h = sc->sc_h1; - const u_char *laddr = LLADDR(ifp->if_sadl); + const u_char *laddr = CLLADDR(ifp->if_sadl); u_int32_t v; /* These regs are not cleared on reset */ diff --git a/sys/dev/ic/i82557.c b/sys/dev/ic/i82557.c index 9e0a24c8c3a..bdd19fa69d5 100644 --- a/sys/dev/ic/i82557.c +++ b/sys/dev/ic/i82557.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82557.c,v 1.102 2007/07/09 21:00:36 ad Exp $ */ +/* $NetBSD: i82557.c,v 1.103 2007/08/26 22:45:56 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.102 2007/07/09 21:00:36 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.103 2007/08/26 22:45:56 dyoung Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -1840,7 +1840,7 @@ fxp_init(struct ifnet *ifp) cb_ias->cb_command = htole16(FXP_CB_COMMAND_IAS | FXP_CB_COMMAND_EL); /* BIG_ENDIAN: no need to swap to store 0xffffffff */ cb_ias->link_addr = 0xffffffff; - memcpy(cb_ias->macaddr, LLADDR(ifp->if_sadl), ETHER_ADDR_LEN); + memcpy(cb_ias->macaddr, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN); FXP_CDIASSYNC(sc, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c index a831cceec7a..36b1db1cdbf 100644 --- a/sys/dev/ic/i82596.c +++ b/sys/dev/ic/i82596.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82596.c,v 1.16 2007/04/17 14:12:06 skrll Exp $ */ +/* $NetBSD: i82596.c,v 1.17 2007/08/26 22:45:56 dyoung Exp $ */ /* * Copyright (c) 2003 Jochen Kunz. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.16 2007/04/17 14:12:06 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.17 2007/08/26 22:45:56 dyoung Exp $"); /* autoconfig and device stuff */ #include <sys/param.h> @@ -420,7 +420,7 @@ iee_cb_setup(struct iee_softc *sc, uint32_t cmd) case IEE_CB_CMD_NOP: /* NOP CMD */ break; case IEE_CB_CMD_IAS: /* Individual Address Setup */ - memcpy(__UNVOLATILE(cb->cb_ind_addr), LLADDR(ifp->if_sadl), + memcpy(__UNVOLATILE(cb->cb_ind_addr), CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN); break; case IEE_CB_CMD_CONF: /* Configure */ diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c index 514562961aa..c755c4559bf 100644 --- a/sys/dev/ic/rt2560.c +++ b/sys/dev/ic/rt2560.c @@ -1,4 +1,4 @@ -/* $NetBSD: rt2560.c,v 1.9 2007/07/09 21:00:38 ad Exp $ */ +/* $NetBSD: rt2560.c,v 1.10 2007/08/26 22:45:56 dyoung Exp $ */ /* $OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $ */ /* $FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/ @@ -24,7 +24,7 @@ * http://www.ralinktech.com/ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.9 2007/07/09 21:00:38 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.10 2007/08/26 22:45:56 dyoung Exp $"); #include "bpfilter.h" @@ -2857,7 +2857,7 @@ rt2560_init(struct ifnet *ifp) for (i = 0; i < N(rt2560_def_mac); i++) RAL_WRITE(sc, rt2560_def_mac[i].reg, rt2560_def_mac[i].val); - IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl)); + IEEE80211_ADDR_COPY(ic->ic_myaddr, CLLADDR(ifp->if_sadl)); rt2560_set_macaddr(sc, ic->ic_myaddr); /* set basic rate set (will be updated later) */ diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c index 0d580277b21..810189f348b 100644 --- a/sys/dev/ic/rt2661.c +++ b/sys/dev/ic/rt2661.c @@ -1,4 +1,4 @@ -/* $NetBSD: rt2661.c,v 1.15 2007/07/09 21:00:38 ad Exp $ */ +/* $NetBSD: rt2661.c,v 1.16 2007/08/26 22:45:56 dyoung Exp $ */ /* $OpenBSD: rt2661.c,v 1.17 2006/05/01 08:41:11 damien Exp $ */ /* $FreeBSD: rt2560.c,v 1.5 2006/06/02 19:59:31 csjp Exp $ */ @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.15 2007/07/09 21:00:38 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.16 2007/08/26 22:45:56 dyoung Exp $"); #include "bpfilter.h" @@ -2745,7 +2745,7 @@ rt2661_init(struct ifnet *ifp) for (i = 0; i < N(rt2661_def_mac); i++) RAL_WRITE(sc, rt2661_def_mac[i].reg, rt2661_def_mac[i].val); - IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl)); + IEEE80211_ADDR_COPY(ic->ic_myaddr, CLLADDR(ifp->if_sadl)); rt2661_set_macaddr(sc, ic->ic_myaddr); /* set host ready */ diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c index 9c0b9c2a7e7..42e09138c3d 100644 --- a/sys/dev/ic/rtl81x9.c +++ b/sys/dev/ic/rtl81x9.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtl81x9.c,v 1.75 2007/07/09 21:00:38 ad Exp $ */ +/* $NetBSD: rtl81x9.c,v 1.76 2007/08/26 22:45:56 dyoung Exp $ */ /* * Copyright (c) 1997, 1998 @@ -86,7 +86,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.75 2007/07/09 21:00:38 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.76 2007/08/26 22:45:56 dyoung Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -1420,7 +1420,7 @@ rtk_init(struct ifnet *ifp) /* Init our MAC address */ for (i = 0; i < ETHER_ADDR_LEN; i++) { - CSR_WRITE_1(sc, RTK_IDR0 + i, LLADDR(ifp->if_sadl)[i]); + CSR_WRITE_1(sc, RTK_IDR0 + i, CLLADDR(ifp->if_sadl)[i]); } /* Init the RX buffer pointer register. */ diff --git a/sys/dev/ic/seeq8005.c b/sys/dev/ic/seeq8005.c index 9b91efda952..8edb53097fd 100644 --- a/sys/dev/ic/seeq8005.c +++ b/sys/dev/ic/seeq8005.c @@ -1,4 +1,4 @@ -/* $NetBSD: seeq8005.c,v 1.40 2007/03/05 17:47:49 he Exp $ */ +/* $NetBSD: seeq8005.c,v 1.41 2007/08/26 22:45:56 dyoung Exp $ */ /* * Copyright (c) 2000, 2001 Ben Harris @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.40 2007/03/05 17:47:49 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.41 2007/08/26 22:45:56 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -724,7 +724,7 @@ ea_select_buffer(struct seeq8005_softc *sc, int bufcode) /* Must be called at splnet */ static void -ea_set_address(struct seeq8005_softc *sc, int which, u_int8_t const *ea) +ea_set_address(struct seeq8005_softc *sc, int which, const u_int8_t *ea) { int i; @@ -777,7 +777,7 @@ ea_init(struct ifnet *ifp) } /* Write the station address - the receiver must be off */ - ea_set_address(sc, 0, (u_int8_t *)LLADDR(ifp->if_sadl)); + ea_set_address(sc, 0, (const u_int8_t *)CLLADDR(ifp->if_sadl)); /* Split board memory into Rx and Tx. */ ea_select_buffer(sc, SEEQ_BUFCODE_TX_EAP); diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c index a0b29ab9731..25d28c7c761 100644 --- a/sys/dev/ic/tulip.c +++ b/sys/dev/ic/tulip.c @@ -1,4 +1,4 @@ -/* $NetBSD: tulip.c,v 1.150 2007/07/09 21:00:40 ad Exp $ */ +/* $NetBSD: tulip.c,v 1.151 2007/08/26 22:45:56 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.150 2007/07/09 21:00:40 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.151 2007/08/26 22:45:56 dyoung Exp $"); #include "bpfilter.h" @@ -1427,7 +1427,7 @@ tlp_rxintr(struct tulip_softc *sc) if (sc->sc_filtmode == TDCTL_Tx_FT_HASHONLY && (ifp->if_flags & IFF_PROMISC) == 0 && ETHER_IS_MULTICAST(eh->ether_dhost) == 0 && - memcmp(LLADDR(ifp->if_sadl), eh->ether_dhost, + memcmp(CLLADDR(ifp->if_sadl), eh->ether_dhost, ETHER_ADDR_LEN) != 0) { m_freem(m); continue; @@ -1913,7 +1913,7 @@ tlp_init(struct ifnet *ifp) for (i = 0; i < ETHER_ADDR_LEN; i++) { bus_space_write_1(sc->sc_st, sc->sc_sh, - cpa + i, LLADDR(ifp->if_sadl)[i]); + cpa + i, CLLADDR(ifp->if_sadl)[i]); } break; } @@ -2643,7 +2643,7 @@ tlp_filter_setup(struct tulip_softc *sc) DPRINTF(sc, ("%s: tlp_filter_setup: sc_flags 0x%08x\n", sc->sc_dev.dv_xname, sc->sc_flags)); - memcpy(enaddr, LLADDR(ifp->if_sadl), ETHER_ADDR_LEN); + memcpy(enaddr, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN); /* * If there are transmissions pending, wait until they have diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c index 51ff71ea13f..835374dd1ba 100644 --- a/sys/dev/if_ndis/if_ndis.c +++ b/sys/dev/if_ndis/if_ndis.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.6 2005/03/31 04:24:36 wpaul Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.13 2007/03/04 06:02:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.14 2007/08/26 22:45:57 dyoung Exp $"); #endif #ifdef __FreeBSD__ @@ -368,7 +368,7 @@ ndis_setmulti(sc) #ifdef __FreeBSD__ if (ifma->ifma_addr->sa_family != AF_LINK) continue; - bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr), + bcopy(CLLADDR(satosdl(ifma->ifma_addr)), mclist + (ETHER_ADDR_LEN * len), ETHER_ADDR_LEN); #else /* __NetBSD__ */ /* diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c index 2e21b0ce9a5..9e18d0e0b9c 100644 --- a/sys/dev/isa/if_el.c +++ b/sys/dev/isa/if_el.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_el.c,v 1.77 2007/03/04 06:02:12 christos Exp $ */ +/* $NetBSD: if_el.c,v 1.78 2007/08/26 22:45:57 dyoung Exp $ */ /* * Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.77 2007/03/04 06:02:12 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.78 2007/08/26 22:45:57 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -314,7 +314,7 @@ el_hardreset(sc) for (i = 0; i < ETHER_ADDR_LEN; i++) bus_space_write_1(iot, ioh, i, - LLADDR(sc->sc_ethercom.ec_if.if_sadl)[i]); + CLLADDR(sc->sc_ethercom.ec_if.if_sadl)[i]); } /* diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c index 80e1d523c58..d60e694e901 100644 --- a/sys/dev/isa/if_iy.c +++ b/sys/dev/isa/if_iy.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iy.c,v 1.75 2007/03/04 06:02:12 christos Exp $ */ +/* $NetBSD: if_iy.c,v 1.76 2007/08/26 22:45:57 dyoung Exp $ */ /* #define IYDEBUG */ /* #define IYMEMDEBUG */ @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.75 2007/03/04 06:02:12 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.76 2007/08/26 22:45:57 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -477,7 +477,7 @@ struct iy_softc *sc; bus_space_write_1(iot, ioh, EEPROM_REG, temp & ~0x10); for (i=0; i<6; ++i) { - bus_space_write_1(iot, ioh, I_ADD(i), LLADDR(ifp->if_sadl)[i]); + bus_space_write_1(iot, ioh, I_ADD(i), CLLADDR(ifp->if_sadl)[i]); } temp = bus_space_read_1(iot, ioh, REG1); diff --git a/sys/dev/marvell/if_gfe.c b/sys/dev/marvell/if_gfe.c index 4d9cf81ce6f..4d738bd65cf 100644 --- a/sys/dev/marvell/if_gfe.c +++ b/sys/dev/marvell/if_gfe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gfe.c,v 1.23 2007/07/09 21:00:51 ad Exp $ */ +/* $NetBSD: if_gfe.c,v 1.24 2007/08/26 22:45:57 dyoung Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.23 2007/07/09 21:00:51 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.24 2007/08/26 22:45:57 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -777,7 +777,7 @@ gfe_rx_get(struct gfe_softc *sc, enum gfe_rxprio rxprio) (rxq->rxq_cmdsts & RX_STS_M) == 0 || (rxq->rxq_cmdsts & RX_STS_HE) || (eh->ether_dhost[0] & 1) != 0 || - memcmp(eh->ether_dhost, LLADDR(ifp->if_sadl), + memcmp(eh->ether_dhost, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN) == 0) { (*ifp->if_input)(ifp, m); m = NULL; @@ -1881,7 +1881,7 @@ gfe_hash_fill(struct gfe_softc *sc) GE_FUNC_ENTER(sc, "gfe_hash_fill"); error = gfe_hash_entry_op(sc, GE_HASH_ADD, GE_RXPRIO_HI, - LLADDR(sc->sc_ec.ec_if.if_sadl)); + CLLADDR(sc->sc_ec.ec_if.if_sadl)); if (error) GE_FUNC_EXIT(sc, "!"); return error; diff --git a/sys/dev/pci/cxgb_l2t.c b/sys/dev/pci/cxgb_l2t.c index 4ef174fcf8f..bbf553ce854 100644 --- a/sys/dev/pci/cxgb_l2t.c +++ b/sys/dev/pci/cxgb_l2t.c @@ -75,8 +75,7 @@ __FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_l2t.c,v 1.2 2007/05/28 22:57:26 kmacy #endif #define VLAN_NONE 0xfff -#define SDL(s) ((struct sockaddr_dl *)s) -#define RT_ENADDR(rt) ((char *)LLADDR(SDL((rt)))) +#define RT_ENADDR(rt) ((char *)LLADDR(satosdl((rt)))) #define rt_expire rt_rmx.rmx_expire #ifdef __FreeBSD__ diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index dd508d341ae..1a38417ebff 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.135 2007/08/10 12:27:35 taca Exp $ */ +/* $NetBSD: if_bge.c,v 1.136 2007/08/26 22:45:57 dyoung Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.135 2007/08/10 12:27:35 taca Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.136 2007/08/26 22:45:57 dyoung Exp $"); #include "bpfilter.h" #include "vlan.h" @@ -1669,9 +1669,9 @@ bge_blockinit(struct bge_softc *sc) /* Set random backoff seed for TX */ CSR_WRITE_4(sc, BGE_TX_RANDOM_BACKOFF, - LLADDR(ifp->if_sadl)[0] + LLADDR(ifp->if_sadl)[1] + - LLADDR(ifp->if_sadl)[2] + LLADDR(ifp->if_sadl)[3] + - LLADDR(ifp->if_sadl)[4] + LLADDR(ifp->if_sadl)[5] + + CLLADDR(ifp->if_sadl)[0] + CLLADDR(ifp->if_sadl)[1] + + CLLADDR(ifp->if_sadl)[2] + CLLADDR(ifp->if_sadl)[3] + + CLLADDR(ifp->if_sadl)[4] + CLLADDR(ifp->if_sadl)[5] + BGE_TX_BACKOFF_SEED_MASK); /* Set inter-packet gap */ diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c index ef7a4f4baa6..b68ebbe57ec 100644 --- a/sys/dev/pci/if_dge.c +++ b/sys/dev/pci/if_dge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_dge.c,v 1.15 2007/03/04 06:02:20 christos Exp $ */ +/* $NetBSD: if_dge.c,v 1.16 2007/08/26 22:45:58 dyoung Exp $ */ /* * Copyright (c) 2004, SUNET, Swedish University Computer Network. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.15 2007/03/04 06:02:20 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.16 2007/08/26 22:45:58 dyoung Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -2224,7 +2224,7 @@ dge_set_filter(struct dge_softc *sc) * Set the station address in the first RAL slot, and * clear the remaining slots. */ - dge_set_ral(sc, LLADDR(ifp->if_sadl), 0); + dge_set_ral(sc, CLLADDR(ifp->if_sadl), 0); for (i = 1; i < RA_TABSIZE; i++) dge_set_ral(sc, NULL, i); diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 36f705528aa..31ba5a416c3 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwi.c,v 1.62 2007/03/04 19:14:25 sketch Exp $ */ +/* $NetBSD: if_iwi.c,v 1.63 2007/08/26 22:45:58 dyoung Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.62 2007/03/04 19:14:25 sketch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.63 2007/08/26 22:45:58 dyoung Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -2359,7 +2359,7 @@ iwi_config(struct iwi_softc *sc) uint32_t data; int error, nchan, i; - IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl)); + IEEE80211_ADDR_COPY(ic->ic_myaddr, CLLADDR(ifp->if_sadl)); DPRINTF(("Setting MAC address to %s\n", ether_sprintf(ic->ic_myaddr))); error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, ic->ic_myaddr, IEEE80211_ADDR_LEN, 0); diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index 097402a7160..998a95aac43 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ste.c,v 1.28 2007/07/09 21:00:55 ad Exp $ */ +/* $NetBSD: if_ste.c,v 1.29 2007/08/26 22:45:58 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.28 2007/07/09 21:00:55 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.29 2007/08/26 22:45:58 dyoung Exp $"); #include "bpfilter.h" @@ -1272,7 +1272,7 @@ ste_init(struct ifnet *ifp) /* Set the station address. */ for (i = 0; i < ETHER_ADDR_LEN; i++) bus_space_write_1(st, sh, STE_StationAddress0 + 1, - LLADDR(ifp->if_sadl)[i]); + CLLADDR(ifp->if_sadl)[i]); /* Set up the receive filter. */ ste_set_filter(sc); diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c index e139bf30cc2..3797e09f301 100644 --- a/sys/dev/pci/if_stge.c +++ b/sys/dev/pci/if_stge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_stge.c,v 1.37 2007/07/09 21:00:55 ad Exp $ */ +/* $NetBSD: if_stge.c,v 1.38 2007/08/26 22:45:58 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.37 2007/07/09 21:00:55 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.38 2007/08/26 22:45:58 dyoung Exp $"); #include "bpfilter.h" @@ -1543,7 +1543,7 @@ stge_init(struct ifnet *ifp) /* Set the station address. */ for (i = 0; i < 6; i++) bus_space_write_1(st, sh, STGE_StationAddress0 + i, - LLADDR(ifp->if_sadl)[i]); + CLLADDR(ifp->if_sadl)[i]); /* * Set the statistics masks. Disable all the RMON stats, diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c index 689b31bef8a..b8ce99f6a05 100644 --- a/sys/dev/pci/if_wm.c +++ b/sys/dev/pci/if_wm.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.142 2007/07/09 21:00:56 ad Exp $ */ +/* $NetBSD: if_wm.c,v 1.143 2007/08/26 22:45:58 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.142 2007/07/09 21:00:56 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.143 2007/08/26 22:45:58 dyoung Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -3836,7 +3836,7 @@ wm_set_filter(struct wm_softc *sc) size = WM_ICH8_RAL_TABSIZE; else size = WM_RAL_TABSIZE; - wm_set_ral(sc, LLADDR(ifp->if_sadl), 0); + wm_set_ral(sc, CLLADDR(ifp->if_sadl), 0); for (i = 1; i < size; i++) wm_set_ral(sc, NULL, i); diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 92bb3f9333f..70f74a71154 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wpi.c,v 1.19 2007/08/15 18:11:14 degroote Exp $ */ +/* $NetBSD: if_wpi.c,v 1.20 2007/08/26 22:45:58 dyoung Exp $ */ /*- * Copyright (c) 2006, 2007 @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.19 2007/08/15 18:11:14 degroote Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.20 2007/08/26 22:45:58 dyoung Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -2823,7 +2823,7 @@ wpi_config(struct wpi_softc *sc) /* configure adapter */ memset(&sc->config, 0, sizeof (struct wpi_config)); - IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl)); + IEEE80211_ADDR_COPY(ic->ic_myaddr, CLLADDR(ifp->if_sadl)); IEEE80211_ADDR_COPY(sc->config.myaddr, ic->ic_myaddr); /*set default channel*/ sc->config.chan = ieee80211_chan2ieee(ic, ic->ic_ibss_chan); diff --git a/sys/dev/qbus/if_il.c b/sys/dev/qbus/if_il.c index 08834b9a929..a3774a5fc1e 100644 --- a/sys/dev/qbus/if_il.c +++ b/sys/dev/qbus/if_il.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_il.c,v 1.16 2007/03/04 06:02:29 christos Exp $ */ +/* $NetBSD: if_il.c,v 1.17 2007/08/26 22:45:59 dyoung Exp $ */ /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.16 2007/03/04 06:02:29 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.17 2007/08/26 22:45:59 dyoung Exp $"); #include "opt_inet.h" @@ -305,8 +305,7 @@ ilinit(struct ifnet *ifp) * wedge the board. */ if (sc->sc_flags & ILF_SETADDR) { - bcopy((void *)LLADDR(ifp->if_sadl), - (void *)&sc->sc_isu, ETHER_ADDR_LEN); + bcopy(CLLADDR(ifp->if_sadl), &sc->sc_isu, ETHER_ADDR_LEN); IL_WCSR(IL_BAR, LOWORD(sc->sc_ui.ui_baddr)); IL_WCSR(IL_BCR, ETHER_ADDR_LEN); IL_WCSR(IL_CSR, ((sc->sc_ui.ui_baddr >> 2) & IL_EUA)|ILC_LDPA); @@ -317,8 +316,8 @@ ilinit(struct ifnet *ifp) IL_WCSR(IL_CSR, ((sc->sc_ui.ui_baddr >> 2) & IL_EUA)|ILC_STAT); if (ilwait(sc, "verifying setaddr")) return 0; - if (memcmp((void *)sc->sc_stats.ils_addr, - (void *)LLADDR(ifp->if_sadl), ETHER_ADDR_LEN) != 0) { + if (memcmp(sc->sc_stats.ils_addr, + CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN) != 0) { printf("%s: setaddr didn't work\n", sc->sc_dev.dv_xname); return 0; @@ -593,7 +592,7 @@ iltotal(struct il_softc *sc) *sum++ += *interval++; sc->sc_if.if_collisions = sc->sc_sum.ils_collis; if ((sc->sc_flags & ILF_SETADDR) && - (memcmp((void *)sc->sc_stats.ils_addr, LLADDR(ifp->if_sadl), + (memcmp(sc->sc_stats.ils_addr, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN) != 0)) { log(LOG_ERR, "%s: physaddr reverted\n", sc->sc_dev.dv_xname); sc->sc_flags &= ~ILF_RUNNING; diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index b092a78eaf5..e0f1700c5c9 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */ -/* $NetBSD: if_rum.c,v 1.14 2007/08/15 16:58:54 kiyohara Exp $ */ +/* $NetBSD: if_rum.c,v 1.15 2007/08/26 22:45:59 dyoung Exp $ */ /*- * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr> @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.14 2007/08/15 16:58:54 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.15 2007/08/26 22:45:59 dyoung Exp $"); #include "bpfilter.h" @@ -1982,7 +1982,7 @@ rum_init(struct ifnet *ifp) /* clear STA registers */ rum_read_multi(sc, RT2573_STA_CSR0, sc->sta, sizeof sc->sta); - IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl)); + IEEE80211_ADDR_COPY(ic->ic_myaddr, CLLADDR(ifp->if_sadl)); rum_set_macaddr(sc, ic->ic_myaddr); /* initialize ASIC */ diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c index 71525053bea..69ced795721 100644 --- a/sys/dev/usb/if_ural.c +++ b/sys/dev/usb/if_ural.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ural.c,v 1.23 2007/08/15 16:58:55 kiyohara Exp $ */ +/* $NetBSD: if_ural.c,v 1.24 2007/08/26 22:45:59 dyoung Exp $ */ /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */ /*- @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.23 2007/08/15 16:58:55 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.24 2007/08/26 22:45:59 dyoung Exp $"); #include "bpfilter.h" @@ -2145,7 +2145,7 @@ ural_init(struct ifnet *ifp) ural_set_txantenna(sc, sc->tx_ant); ural_set_rxantenna(sc, sc->rx_ant); - IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl)); + IEEE80211_ADDR_COPY(ic->ic_myaddr, CLLADDR(ifp->if_sadl)); ural_set_macaddr(sc, ic->ic_myaddr); /* diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index dd74bfa5095..cd660db4ed1 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ -/* $NetBSD: if_zyd.c,v 1.9 2007/08/15 16:58:55 kiyohara Exp $ */ +/* $NetBSD: if_zyd.c,v 1.10 2007/08/26 22:45:59 dyoung Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -22,7 +22,7 @@ * ZyDAS ZD1211/ZD1211B USB WLAN driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.9 2007/08/15 16:58:55 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.10 2007/08/26 22:45:59 dyoung Exp $"); #include "bpfilter.h" @@ -2450,7 +2450,7 @@ zyd_init(struct ifnet *ifp) zyd_stop(ifp, 0); - IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl)); + IEEE80211_ADDR_COPY(ic->ic_myaddr, CLLADDR(ifp->if_sadl)); DPRINTF(("setting MAC address to %s\n", ether_sprintf(ic->ic_myaddr))); error = zyd_set_macaddr(sc, ic->ic_myaddr); if (error != 0) |
