summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorhe <he@NetBSD.org>2008-06-10 22:44:07 +0000
committerhe <he@NetBSD.org>2008-06-10 22:44:07 +0000
commit26a302aa36a9c5dad882b7db527307ffae252aea (patch)
tree9c6a15a0505345fa70296f1bfc03c9492ee1d90c /sys
parentfa64da0d81dbc0a15cddeae35d28b4b3650f23c8 (diff)
Avoid the effects of name space pollution caused by <sys/rb.h>,
which defines rb_data, by instead naming the struct field rxb_data.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/marvell/if_gfe.c6
-rw-r--r--sys/dev/marvell/if_gfevar.h4
2 files changed, 5 insertions, 5 deletions
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 <sys/cdefs.h>
-__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 {