d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

n32 fixes for nlge.

Browse Source 
Use correct define (__mips_n64) for n64 compilation and use correct
parameter type for xlr_paddr_lw() in n32.
This commit is contained in:
Jayachandran C. 2010-09-21 07:58:47 +00:00
parent 231fffcf1a
commit f294c94440
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/mips/rmi/dev/nlge/if_nlge.c
View File

@ -659,7 +659,7 @@ nlge_msgring_handler(int bucket, int size, int code, int stid,
if (is_p2p) {
release_tx_desc(phys_addr);
} else {
#ifdef __mips64
#ifdef __mips_n64
m = (struct mbuf *)(uintptr_t)xlr_paddr_ld(phys_addr);
m->m_nextpkt = NULL;
#else
@ -1912,7 +1912,7 @@ prepare_fmn_message(struct nlge_softc *sc, struct msgrng_msg *fmn_msg,
if (msg_sz == (FMN_SZ - 1)) {
p2p = uma_zalloc(nl_tx_desc_zone, M_NOWAIT);
if (p2p == NULL) {
return 2;
return (2);
}
/*
* Save the virtual address in the descriptor,
@ -1948,7 +1948,7 @@ prepare_fmn_message(struct nlge_softc *sc, struct msgrng_msg *fmn_msg,
/* set eop in most-recent p2d */
cur_p2d[-1] |= (1ULL << 63);
#ifdef __mips64
#ifdef __mips_n64
/*
* On n64, we cannot store our mbuf pointer(64 bit) in the freeback
* message (40bit available), so we put the mbuf in m_nextpkt and

2
sys/mips/rmi/rmi_mips_exts.h
View File

@ -436,7 +436,7 @@ xlr_paddr_ld(uint64_t paddr)
#elif defined(__mips_n32)
static __inline uint32_t
xlr_paddr_lw(uint32_t paddr)
xlr_paddr_lw(uint64_t paddr)
{
uint32_t val;