From 26a302aa36a9c5dad882b7db527307ffae252aea Mon Sep 17 00:00:00 2001 From: he Date: Tue, 10 Jun 2008 22:44:07 +0000 Subject: Avoid the effects of name space pollution caused by , which defines rb_data, by instead naming the struct field rxb_data. --- sys/dev/marvell/if_gfe.c | 6 +++--- sys/dev/marvell/if_gfevar.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/marvell/if_gfe.c b/sys/dev/marvell/if_gfe.c index a1ad98a9836..e64e1c236d9 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.29 2008/04/08 20:40:42 cegger Exp $ */ +/* $NetBSD: if_gfe.c,v 1.30 2008/06/10 22:44:07 he Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.29 2008/04/08 20:40:42 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.30 2008/06/10 22:44:07 he Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -756,7 +756,7 @@ gfe_rx_get(struct gfe_softc *sc, enum gfe_rxprio rxprio) rxq->rxq_fi * sizeof(*rxb), buflen, BUS_DMASYNC_POSTREAD); KASSERT(m->m_len == 0 && m->m_pkthdr.len == 0); - memcpy(m->m_data + m->m_len, rxb->rb_data, buflen); + memcpy(m->m_data + m->m_len, rxb->rxb_data, buflen); m->m_len = buflen; m->m_pkthdr.len = buflen; diff --git a/sys/dev/marvell/if_gfevar.h b/sys/dev/marvell/if_gfevar.h index 1f4c48f5a7b..80355e26dc5 100644 --- a/sys/dev/marvell/if_gfevar.h +++ b/sys/dev/marvell/if_gfevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_gfevar.h,v 1.8 2007/03/04 06:02:14 christos Exp $ */ +/* $NetBSD: if_gfevar.h,v 1.9 2008/06/10 22:44:07 he Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -84,7 +84,7 @@ struct gfe_txqueue { */ struct gfe_rxbuf { - uint8_t rb_data[GE_RXBUF_SIZE]; + uint8_t rxb_data[GE_RXBUF_SIZE]; }; struct gfe_rxqueue { -- cgit