diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2017-06-05 05:10:24 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2017-06-05 05:10:24 +0000 |
| commit | e373a0f03f7dc5ad8a19c1e7a22cb95defe5899f (patch) | |
| tree | c4333b9cfa185a28729fe298d1d55ef7abcf0d78 /sbin/ifconfig | |
| parent | 410d31c988092223ec4fbda1c345a73dc335aab5 (diff) | |
remove vlan(4) specific output handling
vlan(4) now understands the generic vnetid and ifparent ioctls, so
this is redundant.
ok henning@
Diffstat (limited to 'sbin/ifconfig')
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 867107437af..129bfbde1ff 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.341 2017/05/31 05:25:12 dlg Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.342 2017/06/05 05:10:23 dlg Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -221,7 +221,6 @@ void setvlandev(const char *, int); void unsetvlandev(const char *, int); void mpe_status(void); void mpw_status(void); -void vlan_status(void); void setrdomain(const char *, int); int prefix(void *val, int); void getifgroups(void); @@ -3001,7 +3000,6 @@ status(int link, struct sockaddr_dl *sdl, int ls) if_indextoname(ifrdesc.ifr_index, ifname) != NULL) printf("\tpatch: %s\n", ifname); #endif - vlan_status(); getencap(); #ifndef SMALL carp_status(); @@ -3775,23 +3773,6 @@ getencap(void) static int __tag = 0; static int __have_tag = 0; -void -vlan_status(void) -{ - struct vlanreq vreq; - - bzero((char *)&vreq, sizeof(struct vlanreq)); - ifr.ifr_data = (caddr_t)&vreq; - - if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1) - return; - - if (vreq.vlr_tag || (vreq.vlr_parent[0] != '\0')) - printf("\tvlan: %d parent interface: %s\n", - vreq.vlr_tag, vreq.vlr_parent[0] == '\0' ? - "<none>" : vreq.vlr_parent); -} - /* ARGSUSED */ void setvlantag(const char *val, int d) |