summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2019-04-29 04:26:47 +0000
committerdlg <dlg@openbsd.org>2019-04-29 04:26:47 +0000
commit47170b90f4a74f0ae2ecd9197db9397996c0bcd5 (patch)
tree9b1aa9134a4f37486501d7b4be2849b64ae7ca8b
parentdon't have lacp input push lacp packets into the trunkports bpf again. (diff)
downloadwireguard-openbsd-47170b90f4a74f0ae2ecd9197db9397996c0bcd5.tar.xz
wireguard-openbsd-47170b90f4a74f0ae2ecd9197db9397996c0bcd5.zip
tr_unit is unused, so gc it
-rw-r--r--sys/net/if_trunk.c3
-rw-r--r--sys/net/if_trunk.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index 9682fc1edee..994c3707467 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_trunk.c,v 1.138 2019/04/23 10:53:45 dlg Exp $ */
+/* $OpenBSD: if_trunk.c,v 1.139 2019/04/29 04:26:47 dlg Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -158,7 +158,6 @@ trunk_clone_create(struct if_clone *ifc, int unit)
int i, error = 0;
tr = malloc(sizeof(*tr), M_DEVBUF, M_WAITOK|M_ZERO);
- tr->tr_unit = unit;
tr->tr_proto = TRUNK_PROTO_NONE;
for (i = 0; trunk_protos[i].ti_proto != TRUNK_PROTO_NONE; i++) {
if (trunk_protos[i].ti_proto == TRUNK_PROTO_DEFAULT) {
diff --git a/sys/net/if_trunk.h b/sys/net/if_trunk.h
index c4408dc5e5d..21c575f4933 100644
--- a/sys/net/if_trunk.h
+++ b/sys/net/if_trunk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_trunk.h,v 1.26 2018/08/12 23:50:31 ccardenas Exp $ */
+/* $OpenBSD: if_trunk.h,v 1.27 2019/04/29 04:26:47 dlg Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -208,7 +208,6 @@ struct trunk_ifreq {
struct trunk_softc {
struct arpcom tr_ac; /* virtual interface */
- int tr_unit; /* trunk unit */
enum trunk_proto tr_proto; /* trunk protocol */
u_int tr_count; /* number of ports */
struct trunk_port *tr_primary; /* primary port */