PERFORCE change 129544 for review

[Kip Macy]

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

Change 129544 by kmacy at kmacy:storage:toestack on 2007/11/26 05:26:43

	disable merging of data into existing mbufs if 
	new SB_TOE flag is set

Affected files ...

.. //depot/projects/toestack/sys/kern/uipc_sockbuf.c#3 edit
.. //depot/projects/toestack/sys/sys/socketvar.h#2 edit

Differences ...

==== //depot/projects/toestack/sys/kern/uipc_sockbuf.c#3 (text+ko) ====

@@ -760,6 +760,7 @@
 		}
 		if (n && (n->m_flags & M_EOR) == 0 &&
 		    M_WRITABLE(n) &&
+		    !(sb->sb_flags & SB_TOE) &&
 		    m->m_len <= MCLBYTES / 4 && /* XXX: Don't copy too much */
 		    m->m_len <= M_TRAILINGSPACE(n) &&
 		    n->m_type == m->m_type) {

==== //depot/projects/toestack/sys/sys/socketvar.h#2 (text+ko) ====

@@ -130,6 +130,7 @@
 #define	SB_NOINTR	0x40		/* operations not interruptible */
 #define	SB_AIO		0x80		/* AIO operations queued */
 #define	SB_KNOTE	0x100		/* kernel note attached */
+#define	SB_TOE		0x200		/* socket buffer for TOE connection */	
 #define	SB_AUTOSIZE	0x800		/* automatically size socket buffer */
 
 	void	(*so_upcall)(struct socket *, void *, int);