1
0
mirror of https://github.com/openbsd/src.git synced 2026-06-18 07:13:36 +02:00

make ifconfig build without trunklacp.h

The only used part of trunklacp.h in ifconfig is LACP_STATE_BITS.
Add it to if_trunk.h so trunklacp.h can be removed.

ok dlg@
This commit is contained in:
jsg
2026-05-08 03:36:04 +00:00
parent 9c7363c2d6
commit 49f512cd8c
2 changed files with 13 additions and 3 deletions
+1 -2
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: ifconfig.c,v 1.480 2025/12/03 10:19:27 stsp Exp $ */
/* $OpenBSD: ifconfig.c,v 1.481 2026/05/08 03:36:04 jsg Exp $ */
/* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */
/*
@@ -83,7 +83,6 @@
#include <net/if_pppoe.h>
#include <net/if_trunk.h>
#include <net/if_wg.h>
#include <net/trunklacp.h>
#include <net/if_sppp.h>
#include <net/ppp_defs.h>
+12 -1
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: if_trunk.h,v 1.33 2025/11/24 23:40:00 dlg Exp $ */
/* $OpenBSD: if_trunk.h,v 1.34 2026/05/08 03:36:04 jsg Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -88,6 +88,17 @@ struct lacp_opreq {
u_int8_t partner_state;
};
#define LACP_STATE_BITS \
"\020" \
"\001ACTIVITY" \
"\002TIMEOUT" \
"\003AGGREGATION" \
"\004SYNC" \
"\005COLLECTING" \
"\006DISTRIBUTING" \
"\007DEFAULTED" \
"\010EXPIRED"
/* Trunk port settings */
struct trunk_reqport {
char rp_ifname[IFNAMSIZ]; /* name of the trunk */