Module Name: src
Committed By: msaitoh
Date: Tue Jun 25 12:30:50 UTC 2019
Modified Files:
src/sys/net: if_gif.c if_ipsec.c if_l2tp.c if_ppp.c if_vlan.c
Log Message:
Simplify "LIST_HEAD();" to make the code more understandable.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/net/if_gif.c
cvs rdiff -u -r1.21 -r1.22 src/sys/net/if_ipsec.c
cvs rdiff -u -r1.34 -r1.35 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.164 -r1.165 src/sys/net/if_ppp.c
cvs rdiff -u -r1.137 -r1.138 src/sys/net/if_vlan.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.147 src/sys/net/if_gif.c:1.148
--- src/sys/net/if_gif.c:1.147 Tue Jun 18 07:50:43 2019
+++ src/sys/net/if_gif.c Tue Jun 25 12:30:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.147 2019/06/18 07:50:43 msaitoh Exp $ */
+/* $NetBSD: if_gif.c,v 1.148 2019/06/25 12:30:50 msaitoh 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.147 2019/06/18 07:50:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.148 2019/06/25 12:30:50 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -97,9 +97,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1
/*
* gif global variable definitions
*/
-LIST_HEAD(gif_sclist, gif_softc);
static struct {
- struct gif_sclist list;
+ LIST_HEAD(gif_sclist, gif_softc) list;
kmutex_t lock;
} gif_softcs __cacheline_aligned;
Index: src/sys/net/if_ipsec.c
diff -u src/sys/net/if_ipsec.c:1.21 src/sys/net/if_ipsec.c:1.22
--- src/sys/net/if_ipsec.c:1.21 Thu Mar 14 03:52:40 2019
+++ src/sys/net/if_ipsec.c Tue Jun 25 12:30:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipsec.c,v 1.21 2019/03/14 03:52:40 knakahara Exp $ */
+/* $NetBSD: if_ipsec.c,v 1.22 2019/06/25 12:30:50 msaitoh Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.21 2019/03/14 03:52:40 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.22 2019/06/25 12:30:50 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -139,9 +139,8 @@ static int if_ipsec_set_addr_port(struct
*/
/* This list is used in ioctl context only. */
-LIST_HEAD(ipsec_sclist, ipsec_softc);
static struct {
- struct ipsec_sclist list;
+ LIST_HEAD(ipsec_sclist, ipsec_softc) list;
kmutex_t lock;
} ipsec_softcs __cacheline_aligned;
Index: src/sys/net/if_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.34 src/sys/net/if_l2tp.c:1.35
--- src/sys/net/if_l2tp.c:1.34 Fri Apr 26 11:51:56 2019
+++ src/sys/net/if_l2tp.c Tue Jun 25 12:30:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_l2tp.c,v 1.34 2019/04/26 11:51:56 pgoyette Exp $ */
+/* $NetBSD: if_l2tp.c,v 1.35 2019/06/25 12:30:50 msaitoh Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.34 2019/04/26 11:51:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.35 2019/06/25 12:30:50 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -95,9 +95,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v
/*
* l2tp global variable definitions
*/
-LIST_HEAD(l2tp_sclist, l2tp_softc);
static struct {
- struct l2tp_sclist list;
+ LIST_HEAD(l2tp_sclist, l2tp_softc) list;
kmutex_t lock;
} l2tp_softcs __cacheline_aligned;
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.164 src/sys/net/if_ppp.c:1.165
--- src/sys/net/if_ppp.c:1.164 Fri Jan 25 08:51:29 2019
+++ src/sys/net/if_ppp.c Tue Jun 25 12:30:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.164 2019/01/25 08:51:29 knakahara Exp $ */
+/* $NetBSD: if_ppp.c,v 1.165 2019/06/25 12:30:50 msaitoh Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.164 2019/01/25 08:51:29 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.165 2019/06/25 12:30:50 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -206,9 +206,8 @@ static int ppp_clone_destroy(struct ifne
static struct ppp_softc *ppp_create(const char *, int);
-LIST_HEAD(ppp_sclist, ppp_softc);
static struct {
- struct ppp_sclist list;
+ LIST_HEAD(ppp_sclist, ppp_softc) list;
kmutex_t lock;
} ppp_softcs __cacheline_aligned;
Index: src/sys/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.137 src/sys/net/if_vlan.c:1.138
--- src/sys/net/if_vlan.c:1.137 Tue Jun 18 08:36:52 2019
+++ src/sys/net/if_vlan.c Tue Jun 25 12:30:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.137 2019/06/18 08:36:52 msaitoh Exp $ */
+/* $NetBSD: if_vlan.c,v 1.138 2019/06/25 12:30:50 msaitoh Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.137 2019/06/18 08:36:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.138 2019/06/25 12:30:50 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -215,10 +215,9 @@ static void vlan_linkmib_update(struct i
static struct ifvlan_linkmib* vlan_lookup_tag_psref(struct ifnet *,
uint16_t, struct psref *);
-LIST_HEAD(vlan_ifvlist, ifvlan);
static struct {
kmutex_t lock;
- struct vlan_ifvlist list;
+ LIST_HEAD(vlan_ifvlist, ifvlan) list;
} ifv_list __cacheline_aligned;
