From owner-svn-src-head@FreeBSD.ORG  Tue Sep 21 07:58:48 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 297501065670;
	Tue, 21 Sep 2010 07:58:48 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1886E8FC16;
	Tue, 21 Sep 2010 07:58:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8L7wlbe084145;
	Tue, 21 Sep 2010 07:58:47 GMT
	(envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8L7wlce084142;
	Tue, 21 Sep 2010 07:58:47 GMT
	(envelope-from jchandra@svn.freebsd.org)
Message-Id: <201009210758.o8L7wlce084142@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Tue, 21 Sep 2010 07:58:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212957 - in head/sys/mips/rmi: . dev/nlge
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Sep 2010 07:58:48 -0000

Author: jchandra
Date: Tue Sep 21 07:58:47 2010
New Revision: 212957
URL: http://svn.freebsd.org/changeset/base/212957

Log:
  n32 fixes for nlge.
  
  Use correct define (__mips_n64) for n64 compilation and use correct
  parameter type for xlr_paddr_lw() in n32.

Modified:
  head/sys/mips/rmi/dev/nlge/if_nlge.c
  head/sys/mips/rmi/rmi_mips_exts.h

Modified: head/sys/mips/rmi/dev/nlge/if_nlge.c
==============================================================================
--- head/sys/mips/rmi/dev/nlge/if_nlge.c	Tue Sep 21 07:44:40 2010	(r212956)
+++ head/sys/mips/rmi/dev/nlge/if_nlge.c	Tue Sep 21 07:58:47 2010	(r212957)
@@ -659,7 +659,7 @@ nlge_msgring_handler(int bucket, int siz
 			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 *s
 			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 *s
 	/* 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 

Modified: head/sys/mips/rmi/rmi_mips_exts.h
==============================================================================
--- head/sys/mips/rmi/rmi_mips_exts.h	Tue Sep 21 07:44:40 2010	(r212956)
+++ head/sys/mips/rmi/rmi_mips_exts.h	Tue Sep 21 07:58:47 2010	(r212957)
@@ -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;