Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.235.2.4
retrieving revision 1.252
diff -u -p -r1.235.2.4 -r1.252
--- src/sys/kern/uipc_socket.c	2015/12/27 12:10:05	1.235.2.4
+++ src/sys/kern/uipc_socket.c	2016/10/13 19:10:23	1.252
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.235.2.4 2015/12/27 12:10:05 skrll Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.252 2016/10/13 19:10:23 uwe Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.235.2.4 2015/12/27 12:10:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.252 2016/10/13 19:10:23 uwe Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -648,7 +648,7 @@ solisten(struct socket *so, int backlog,
 	short	oldopt, oldqlimit;
 
 	solock(so);
-	if ((so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING |
+	if ((so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING | 
 	    SS_ISDISCONNECTING)) != 0) {
 		sounlock(so);
 		return EINVAL;
@@ -786,7 +786,7 @@ soabort(struct socket *so)
 {
 	u_int refs;
 	int error;
-
+	
 	KASSERT(solocked(so));
 	KASSERT(so->so_head == NULL);
 
@@ -998,7 +998,7 @@ sosend(struct socket *so, struct sockadd
 					m = m_gethdr(M_WAIT, MT_DATA);
 					mlen = MHLEN;
 					m->m_pkthdr.len = 0;
-					m->m_pkthdr.rcvif = NULL;
+					m_reset_rcvif(m);
 				} else {
 					m = m_get(M_WAIT, MT_DATA);
 					mlen = MLEN;
@@ -1324,8 +1324,7 @@ soreceive(struct socket *so, struct mbuf
 				m->m_next = NULL;
 				m = so->so_rcv.sb_mb;
 			} else {
-				MFREE(m, so->so_rcv.sb_mb);
-				m = so->so_rcv.sb_mb;
+				m = so->so_rcv.sb_mb = m_free(m);
 			}
 			sbsync(&so->so_rcv, nextrecord);
 		}
@@ -1349,8 +1348,7 @@ soreceive(struct socket *so, struct mbuf
 					m->m_next = 0;
 					m = so->so_rcv.sb_mb;
 				} else {
-					MFREE(m, so->so_rcv.sb_mb);
-					m = so->so_rcv.sb_mb;
+					m = so->so_rcv.sb_mb = m_free(m);
 				}
 			}
 		}
@@ -1505,8 +1503,7 @@ soreceive(struct socket *so, struct mbuf
 					so->so_rcv.sb_mb = m = m->m_next;
 					*mp = NULL;
 				} else {
-					MFREE(m, so->so_rcv.sb_mb);
-					m = so->so_rcv.sb_mb;
+					m = so->so_rcv.sb_mb = m_free(m);
 				}
 				/*
 				 * If m != NULL, we also know that
@@ -1918,7 +1915,7 @@ so_setsockopt(struct lwp *l, struct sock
 
 	return error;
 }
-
+ 
 /*
  * internal get SOL_SOCKET options
  */
@@ -2247,7 +2244,7 @@ filt_soread(struct knote *kn, long hint)
 		rv = 1;
 	else if (kn->kn_sfflags & NOTE_LOWAT)
 		rv = (kn->kn_data >= kn->kn_sdata);
-	else
+	else 
 		rv = (kn->kn_data >= so->so_rcv.sb_lowat);
 	if (hint != NOTE_SUBMIT)
 		sounlock(so);