diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-11-28 10:12:51 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-11-28 10:12:51 +0000 |
| commit | c31df7b0cc15494b67dec7ced681c046db1490e3 (patch) | |
| tree | 11f7ca0b00facacbb81829c387bec40822f1c428 /sbin | |
| parent | 62e08cbe296c7760592e94774b4c41bc47673da4 (diff) | |
Rename "flowmax" to "maxflow" and give each switch(4) ioctl a
dedicated number. Both changes for consistency.
OK rzalamena@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ifconfig/brconfig.c | 6 | ||||
| -rw-r--r-- | sbin/ifconfig/ifconfig.8 | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sbin/ifconfig/brconfig.c b/sbin/ifconfig/brconfig.c index a407a9866df..46d5e67f37d 100644 --- a/sbin/ifconfig/brconfig.c +++ b/sbin/ifconfig/brconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: brconfig.c,v 1.13 2016/11/18 20:43:39 reyk Exp $ */ +/* $OpenBSD: brconfig.c,v 1.14 2016/11/28 10:12:50 reyk Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -1011,10 +1011,10 @@ switch_cfg(char *delim) printf("%sdatapath %#016llx", delim, bp.ifbrp_datapath); strlcpy(bp.ifbrp_name, name, sizeof(bp.ifbrp_name)); - if (ioctl(s, SIOCSWGFLOWMAX, (caddr_t)&bp) < 0) + if (ioctl(s, SIOCSWGMAXFLOW, (caddr_t)&bp) < 0) err(1, "%s", name); - printf(" flowmax %d", bp.ifbrp_maxflow); + printf(" maxflow %d", bp.ifbrp_maxflow); strlcpy(bp.ifbrp_name, name, sizeof(bp.ifbrp_name)); if (ioctl(s, SIOCSWGMAXGROUP, (caddr_t)&bp) < 0) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index deefdc2f0e0..e0ee2ac2ec7 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ifconfig.8,v 1.275 2016/10/06 14:47:00 naddy Exp $ +.\" $OpenBSD: ifconfig.8,v 1.276 2016/11/28 10:12:50 reyk Exp $ .\" $NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $ .\" $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $ .\" @@ -31,7 +31,7 @@ .\" .\" @(#)ifconfig.8 8.4 (Berkeley) 6/1/94 .\" -.Dd $Mdocdate: October 6 2016 $ +.Dd $Mdocdate: November 28 2016 $ .Dt IFCONFIG 8 .Os .Sh NAME @@ -1536,7 +1536,7 @@ Only can be used for the .Ar interface . Only one interface can be added as a local port. -.It Cm datapath Ar datapath_id +.It Cm datapath Ar id Configure the datapath ID for the switch. The default value is generated randomly. .It Cm del Ar interface @@ -1545,14 +1545,14 @@ Remove from the switch. Promiscuous mode is turned off for the interface when it is removed from the switch. -.It Cm flowmax Ar flowmax +.It Cm maxflow Ar number Set the maximum number of flows per table. The default value is 10000. -.It Cm maxgroup Ar maxgroup +.It Cm maxgroup Ar number Set the maximum number of groups. The default value is 1000. -.It Cm portno Ar interface Ar port_no -Set the port_no for the port named +.It Cm portno Ar interface Ar number +Set the port number for the port named .Ar interface . The default value is the interface index of the .Ar interface . |