From owner-freebsd-current  Sat May  1 14:50:50 1999
Delivered-To: freebsd-current@freebsd.org
Received: from isbalham.ist.co.uk (isbalham.ist.co.uk [192.31.26.1])
	by hub.freebsd.org (Postfix) with ESMTP id 5282014CB0
	for <current@freebsd.org>; Sat,  1 May 1999 14:50:47 -0700 (PDT)
	(envelope-from rb@gid.co.uk)
Received: from gid.co.uk (uucp@localhost)
	by isbalham.ist.co.uk (8.9.2/8.8.7) with UUCP id WAA80177
	for freebsd.org!current; Sat, 1 May 1999 22:50:46 +0100 (BST)
	(envelope-from rb@gid.co.uk)
Received: from [194.32.164.2] by seagoon.gid.co.uk; Sat, 1 May 1999 22:48:32 +0100 (BST)
X-Sender: rb@194.32.164.1
Message-Id: <l03020903b35134590ac0@[194.32.164.2]>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Date: Sat, 1 May 1999 22:48:29 +0000
To: current@freebsd.org
From: Bob Bishop <rb@gid.co.uk>
Subject: if_xl.c noise
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

Hi,

Does version 1.34 of if_xl.c really look like the following around line
1886, or is my repository hosed?

<<<<<<< if_xl.c
        /*
         * Force longword alignment for packet payload for all cpus.  This
         * will optimize NFS ops which have to realign unaligned buffers.
         */
=======
        /* Force longword alignment for packet payload. */
>>>>>>> 1.34
        m_new->m_data += 2;
<<<<<<< if_xl.c

=======

>>>>>>> 1.34
        c->xl_mbuf = m_new;
        c->xl_ptr->xl_status = 0;
        c->xl_ptr->xl_frag.xl_addr = vtophys(mtod(m_new, caddr_t));
        c->xl_ptr->xl_frag.xl_len = MCLBYTES | XL_LAST_FRAG;

        return(0);



--
Bob Bishop              (0118) 977 4017  international code +44 118
rb@gid.co.uk        fax (0118) 989 4254  between 0800 and 1800 UK




To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message