Date: Sat, 1 May 1999 22:48:29 +0000 From: Bob Bishop <rb@gid.co.uk> To: current@freebsd.org Subject: if_xl.c noise Message-ID: <l03020903b35134590ac0@[194.32.164.2]>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?l03020903b35134590ac0>