Module Name: src
Committed By: ozaki-r
Date: Sun Jun 12 10:14:13 UTC 2016
Modified Files:
src/sys/sys: mbuf.h
Log Message:
Fix m_reset_rcvif
m_reset_rcvif should zero whole m_pkthdr._rcvif union, which is
the original behavior.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/sys/mbuf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.164 src/sys/sys/mbuf.h:1.165
--- src/sys/sys/mbuf.h:1.164 Fri Jun 10 13:31:45 2016
+++ src/sys/sys/mbuf.h Sun Jun 12 10:14:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.164 2016/06/10 13:31:45 ozaki-r Exp $ */
+/* $NetBSD: mbuf.h,v 1.165 2016/06/12 10:14:12 ozaki-r Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -980,7 +980,9 @@ static __inline void
m_reset_rcvif(struct mbuf *m)
{
- m->m_pkthdr.rcvif_index = 0;
+ /* A caller may expect whole _rcvif union is zeroed */
+ /* m->m_pkthdr.rcvif_index = 0; */
+ m->m_pkthdr._rcvif.ctx = NULL;
}
static __inline void
