svn commit: r248882 - head/sys/netgraph

[Gleb Smirnoff]

Author: glebius
Date: Fri Mar 29 13:51:01 2013
New Revision: 248882
URL: http://svnweb.freebsd.org/changeset/base/248882

Log:
  Non-functional cleanup of ng_ksocket_incoming2().

Modified:
  head/sys/netgraph/ng_ksocket.c

Modified: head/sys/netgraph/ng_ksocket.c
==============================================================================
--- head/sys/netgraph/ng_ksocket.c	Fri Mar 29 13:24:19 2013	(r248881)
+++ head/sys/netgraph/ng_ksocket.c	Fri Mar 29 13:51:01 2013	(r248882)
@@ -1047,9 +1047,8 @@ ng_ksocket_incoming2(node_p node, hook_p
 	struct uio auio;
 	int flags, error;
 
-	/* so = priv->so; *//* XXX could have derived this like so */
 	KASSERT(so == priv->so, ("%s: wrong socket", __func__));
-	
+
 	/* Allow next incoming event to be queued. */
 	atomic_store_rel_int(&priv->fn_sent, 0);
 
@@ -1105,7 +1104,7 @@ ng_ksocket_incoming2(node_p node, hook_p
 
 		/* Try to get next packet from socket */
 		if ((error = soreceive(so, (so->so_state & SS_ISCONNECTED) ?
-		    NULL : &sa, &auio, &m, (struct mbuf **)0, &flags)) != 0)
+		    NULL : &sa, &auio, &m, NULL, &flags)) != 0)
 			break;
 
 		/* See if we got anything */
@@ -1153,12 +1152,13 @@ sendit:		/* Forward data with optional p
 	 * If the peer has closed the connection, forward a 0-length mbuf
 	 * to indicate end-of-file.
 	 */
-	if (so->so_rcv.sb_state & SBS_CANTRCVMORE && !(priv->flags & KSF_EOFSEEN)) {
-		MGETHDR(m, M_NOWAIT, MT_DATA);
-		if (m != NULL) {
-			m->m_len = m->m_pkthdr.len = 0;
+	if (so->so_rcv.sb_state & SBS_CANTRCVMORE &&
+	    !(priv->flags & KSF_EOFSEEN)) {
+		struct mbuf *m;
+
+		m = m_gethdr(M_NOWAIT, MT_DATA);
+		if (m != NULL)
 			NG_SEND_DATA_ONLY(error, priv->hook, m);
-		}
 		priv->flags |= KSF_EOFSEEN;
 	}
 }