Module Name: src
Committed By: knakahara
Date: Mon Nov 27 05:05:51 UTC 2017
Modified Files:
src/sys/net: if_gif.c
src/sys/netinet: in_gif.c
src/sys/netinet6: in6_gif.c
Log Message:
IFF_RUNNING checking in Rx and Tx processing is unnecessary now.
Because the configs of gif (members of gif_var) are protected by psref(9).
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/net/if_gif.c
cvs rdiff -u -r1.90 -r1.91 src/sys/netinet/in_gif.c
cvs rdiff -u -r1.88 -r1.89 src/sys/netinet6/in6_gif.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_gif.c
diff -u src/sys/net/if_gif.c:1.133 src/sys/net/if_gif.c:1.134
--- src/sys/net/if_gif.c:1.133 Mon Nov 27 05:02:22 2017
+++ src/sys/net/if_gif.c Mon Nov 27 05:05:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.133 2017/11/27 05:02:22 knakahara Exp $ */
+/* $NetBSD: if_gif.c,v 1.134 2017/11/27 05:05:50 knakahara Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.133 2017/11/27 05:02:22 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.134 2017/11/27 05:05:50 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -378,8 +378,7 @@ gif_encapcheck(struct mbuf *m, int off,
if (sc == NULL)
return 0;
- if ((sc->gif_if.if_flags & (IFF_UP|IFF_RUNNING))
- != (IFF_UP|IFF_RUNNING))
+ if ((sc->gif_if.if_flags & IFF_UP) == 0)
return 0;
var = gif_getref_variant(sc, &psref);
@@ -492,7 +491,7 @@ gif_output(struct ifnet *ifp, struct mbu
goto end;
}
- if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) {
+ if ((ifp->if_flags & IFF_UP) == 0) {
m_freem(m);
error = ENETDOWN;
goto end;
Index: src/sys/netinet/in_gif.c
diff -u src/sys/netinet/in_gif.c:1.90 src/sys/netinet/in_gif.c:1.91
--- src/sys/netinet/in_gif.c:1.90 Mon Nov 27 05:02:22 2017
+++ src/sys/netinet/in_gif.c Mon Nov 27 05:05:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in_gif.c,v 1.90 2017/11/27 05:02:22 knakahara Exp $ */
+/* $NetBSD: in_gif.c,v 1.91 2017/11/27 05:05:51 knakahara Exp $ */
/* $KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.90 2017/11/27 05:02:22 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.91 2017/11/27 05:05:51 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -216,7 +216,7 @@ in_gif_input(struct mbuf *m, int off, in
ip = mtod(m, const struct ip *);
gifp = &sc->gif_if;
- if ((gifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) {
+ if ((gifp->if_flags & IFF_UP) == 0) {
m_freem(m);
ip_statinc(IP_STAT_NOGIF);
return;
Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.88 src/sys/netinet6/in6_gif.c:1.89
--- src/sys/netinet6/in6_gif.c:1.88 Mon Nov 27 05:02:22 2017
+++ src/sys/netinet6/in6_gif.c Mon Nov 27 05:05:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_gif.c,v 1.88 2017/11/27 05:02:22 knakahara Exp $ */
+/* $NetBSD: in6_gif.c,v 1.89 2017/11/27 05:05:51 knakahara Exp $ */
/* $KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.88 2017/11/27 05:02:22 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.89 2017/11/27 05:05:51 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -233,7 +233,7 @@ in6_gif_input(struct mbuf **mp, int *off
ip6 = mtod(m, struct ip6_hdr *);
gifp = &sc->gif_if;
- if ((gifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) {
+ if ((gifp->if_flags & IFF_UP) == 0) {
m_freem(m);
IP6_STATINC(IP6_STAT_NOGIF);
return IPPROTO_DONE;
