Module Name: src
Committed By: pooka
Date: Tue Feb 25 22:42:06 UTC 2014
Modified Files:
src/sys/net: if_ethersubr.c
Log Message:
If the in6 domain was not attached, do not attempt to process IPv6 packets.
To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/sys/net/if_ethersubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.195 src/sys/net/if_ethersubr.c:1.196
--- src/sys/net/if_ethersubr.c:1.195 Sat Jun 29 21:06:58 2013
+++ src/sys/net/if_ethersubr.c Tue Feb 25 22:42:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.195 2013/06/29 21:06:58 rmind Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.196 2014/02/25 22:42:06 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.195 2013/06/29 21:06:58 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.196 2014/02/25 22:42:06 pooka Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -852,6 +852,10 @@ ether_input(struct ifnet *ifp, struct mb
#endif
#ifdef INET6
case ETHERTYPE_IPV6:
+ if (__predict_false(!in6_present)) {
+ m_freem(m);
+ return;
+ }
#ifdef GATEWAY
if (ip6flow_fastforward(&m))
return;
