Module Name: src
Committed By: matt
Date: Wed Aug 19 07:33:31 UTC 2009
Modified Files:
src/sys/arch/mips/sibyte/dev [matt-nb5-mips64]: sbmac.c
Log Message:
mtod(m, unsigned int) makes gcc unhappy on _LP64. Use uintptr_t instead.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.24.1 src/sys/arch/mips/sibyte/dev/sbmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/sibyte/dev/sbmac.c
diff -u src/sys/arch/mips/sibyte/dev/sbmac.c:1.28 src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.1
--- src/sys/arch/mips/sibyte/dev/sbmac.c:1.28 Thu Feb 7 01:21:52 2008
+++ src/sys/arch/mips/sibyte/dev/sbmac.c Wed Aug 19 07:33:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbmac.c,v 1.28 2008/02/07 01:21:52 dyoung Exp $ */
+/* $NetBSD: sbmac.c,v 1.28.24.1 2009/08/19 07:33:30 matt Exp $ */
/*
* Copyright 2000, 2001, 2004
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.28 2008/02/07 01:21:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.28.24.1 2009/08/19 07:33:30 matt Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
@@ -626,7 +626,7 @@
d->sbdma_dscrtable[dsc].dscr_b =
V_DMA_DSCRB_OPTIONS(K_DMA_ETHTX_APPENDCRC_APPENDPAD) |
V_DMA_DSCRB_A_SIZE((m->m_len +
- (mtod(m,unsigned int) & 0x0000001F))) |
+ (mtod(m,uintptr_t) & 0x0000001F))) |
V_DMA_DSCRB_PKT_SIZE_MSB((m->m_pkthdr.len & 0xc000) >> 14) |
V_DMA_DSCRB_PKT_SIZE(m->m_pkthdr.len & 0x3fff);
