diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-27 22:52:56 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-27 22:52:56 +0000 |
| commit | 65d32803da3084dd8082d8443d811f84527d6b1e (patch) | |
| tree | 92ab06dc121e9f046de5de03c561934ff2de52d6 /sbin/ifconfig | |
| parent | 1b11c13ec312f9f017cd364afb866f81fcec2462 (diff) | |
let vlan functionality make it into the -DSMALL ifconfig binary
ok sthen
Diffstat (limited to 'sbin/ifconfig')
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 509e2ab6b99..76380705865 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.214 2009/02/16 20:04:12 canacar Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.215 2009/04/27 22:52:55 deraadt Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -334,10 +334,12 @@ const struct cmd { { "range", NEXTARG, 0, setatrange }, { "phase", NEXTARG, 0, setatphase }, { "mplslabel", NEXTARG, 0, setmpelabel }, +#endif /* SMALL */ { "vlan", NEXTARG, 0, setvlantag }, { "vlanprio", NEXTARG, 0, setvlanprio }, { "vlandev", NEXTARG, 0, setvlandev }, { "-vlandev", 1, 0, unsetvlandev }, +#ifndef SMALL { "advbase", NEXTARG, 0, setcarp_advbase }, { "advskew", NEXTARG, 0, setcarp_advskew }, { "carppeer", NEXTARG, 0, setcarppeer }, @@ -2605,7 +2607,9 @@ status(int link, struct sockaddr_dl *sdl) if (ioctl(s, SIOCGIFPRIORITY, &ifrdesc) == 0) printf("\tpriority: %d\n", ifrdesc.ifr_metric); +#endif vlan_status(); +#ifndef SMALL carp_status(); pfsync_status(); pppoe_status(); @@ -3112,6 +3116,7 @@ setmpelabel(const char *val, int d) if (ioctl(s, SIOCSETLABEL, (caddr_t)&ifr) == -1) warn("SIOCSETLABEL"); } +#endif /* SMALL */ static int __tag = 0; static int __have_tag = 0; @@ -3238,6 +3243,7 @@ unsetvlandev(const char *val, int d) err(1, "SIOCSETVLAN"); } +#ifndef SMALL static const char *carp_states[] = { CARP_STATES }; static const char *carp_bal_modes[] = { CARP_BAL_MODES }; |