if_xl.c noise

[Bob Bishop]

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
r...@gid.co.uk        fax (0118) 989 4254  between 0800 and 1800 UK




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