From eb53283166f3d5ee362e92e9377cf2b75bc7c22c Mon Sep 17 00:00:00 2001 From: rwatson Date: Sat, 5 Jul 2008 16:39:24 +0000 Subject: Rename several functions in if_lmc with potential name collisions with global symbols, such as raw_input and raw_output, to have lmc_ prefixes. This doesn't affect actual functionality since the functions are static, but will limit the opportunities for current confusion and future difficulty. MFC after: 3 days --- sys/dev/lmc/if_lmc.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/dev/lmc/if_lmc.h') diff --git a/sys/dev/lmc/if_lmc.h b/sys/dev/lmc/if_lmc.h index 140750d..c78b162 100644 --- a/sys/dev/lmc/if_lmc.h +++ b/sys/dev/lmc/if_lmc.h @@ -1535,7 +1535,7 @@ static int t1_ioctl(softc_t *, struct ioctl *); defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)) static void netisr_dispatch(int, struct mbuf *); # endif -static void raw_input(struct ifnet *, struct mbuf *); +static void lmc_raw_input(struct ifnet *, struct mbuf *); #endif /* IFNET */ #if BSD @@ -1591,19 +1591,19 @@ static int core_ioctl(softc_t *, u_long, caddr_t); static void core_watchdog(softc_t *); #if IFNET -static int raw_ioctl(struct ifnet *, u_long, caddr_t); -static int ifnet_ioctl(struct ifnet *, u_long, caddr_t); -static void ifnet_start(struct ifnet *); -static int raw_output(struct ifnet *, struct mbuf *, +static int lmc_raw_ioctl(struct ifnet *, u_long, caddr_t); +static int lmc_ifnet_ioctl(struct ifnet *, u_long, caddr_t); +static void lmc_ifnet_start(struct ifnet *); +static int lmc_raw_output(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); -static void ifnet_watchdog(struct ifnet *); +static void lmc_ifnet_watchdog(struct ifnet *); # ifdef __OpenBSD__ static int ifmedia_change(struct ifnet *); static void ifmedia_status(struct ifnet *, struct ifmediareq *); # endif /* __OpenBSD__ */ static void setup_ifnet(struct ifnet *); -static int ifnet_attach(softc_t *); -static void ifnet_detach(softc_t *); +static int lmc_ifnet_attach(softc_t *); +static void lmc_ifnet_detach(softc_t *); #endif /* IFNET */ #if NETGRAPH -- cgit v1.1