summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2015-02-09 00:21:59 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2015-02-09 00:21:59 +0000
commit661a23091f5137cba73bcb2edd74f9ccefb9f783 (patch)
treedb7ce4d8f83c4430b0e3f315999814c4e032dd1f /sys
parent349143a74c29ea094439d5357425e75cf0a3eb1f (diff)
move the init of the if_input from ether_ifattach to if_attach.
ok mpi@
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if.c4
-rw-r--r--sys/net/if_ethersubr.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/net/if.c b/sys/net/if.c
index 2dcdc636105..7a99fdf7255 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.317 2015/02/08 06:00:52 mpi Exp $ */
+/* $OpenBSD: if.c,v 1.318 2015/02/09 00:21:58 dlg Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -405,6 +405,8 @@ if_attach_common(struct ifnet *ifp)
M_WAITOK|M_ZERO);
ifp->if_linkstatetask = malloc(sizeof(*ifp->if_linkstatetask),
M_TEMP, M_WAITOK|M_ZERO);
+
+ SLIST_INIT(&ifp->if_inputs);
}
void
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 07be9fb9e5f..05e07b061df 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.187 2015/02/08 06:00:52 mpi Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.188 2015/02/09 00:21:58 dlg Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -769,7 +769,6 @@ ether_ifattach(struct ifnet *ifp)
ifp->if_hdrlen = ETHER_HDR_LEN;
ifp->if_mtu = ETHERMTU;
ifp->if_output = ether_output;
- SLIST_INIT(&ifp->if_inputs);
ether_ifih = malloc(sizeof(*ether_ifih), M_DEVBUF, M_WAITOK);
ether_ifih->ifih_input = ether_input;