From owner-p4-projects@FreeBSD.ORG  Sat Aug  9 08:06:32 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 214CD1065671; Sat,  9 Aug 2008 08:06:32 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9CC7106568D
	for <perforce@FreeBSD.org>; Sat,  9 Aug 2008 08:06:31 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CAAF68FC16
	for <perforce@FreeBSD.org>; Sat,  9 Aug 2008 08:06:31 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7986VOA033661
	for <perforce@FreeBSD.org>; Sat, 9 Aug 2008 08:06:31 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7986VlT033659
	for perforce@freebsd.org; Sat, 9 Aug 2008 08:06:31 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Sat, 9 Aug 2008 08:06:31 GMT
Message-Id: <200808090806.m7986VlT033659@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong <weongyo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 146961 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Aug 2008 08:06:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=146961

Change 146961 by weongyo@weongyo_ws on 2008/08/09 08:06:00

	fix a memory alignment problem on sparc64.  With this fix upgt(4)
	works on sparc64 also.
	
	Submitted by:	yongari

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_upgt.c#2 edit

Differences ...

==== //depot/projects/vap/sys/dev/usb/if_upgt.c#2 (text+ko) ====

@@ -1719,15 +1719,16 @@
 	/* create mbuf which is suitable for strict alignment archs */
 	KASSERT((pkglen + ETHER_ALIGN) < MCLBYTES,
 	    ("A current mbuf storage is small (%d)", pkglen + ETHER_ALIGN));
-	m = m_devget(rxdesc->data - ETHER_ALIGN, pkglen + ETHER_ALIGN, 0, ifp,
-	    NULL);
+	m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		device_printf(sc->sc_dev, "could not create RX mbuf!\n");
 		return;
 	}
 	m_adj(m, ETHER_ALIGN);
+	bcopy(rxdesc->data, mtod(m, char *), pkglen);
 	/* trim FCS */
-	m_adj(m, -IEEE80211_CRC_LEN);
+	m->m_len = m->m_pkthdr.len = pkglen - IEEE80211_CRC_LEN;
+	m->m_pkthdr.rcvif = ifp;
 
 	if (bpf_peers_present(ifp->if_bpf)) {
 		struct upgt_rx_radiotap_header *tap = &sc->sc_rxtap;