summaryrefslogtreecommitdiff
path: root/sbin/ifconfig
diff options
context:
space:
mode:
authorChristiano F. Haesbaert <haesbaert@cvs.openbsd.org>2011-12-04 06:26:11 +0000
committerChristiano F. Haesbaert <haesbaert@cvs.openbsd.org>2011-12-04 06:26:11 +0000
commit968dfa1e9404a727c5a18f522e9ab5cd4a09e352 (patch)
tree7afe72de8ae7348da03bc330d08ee73780dde3f6 /sbin/ifconfig
parentc0dcc65dc40ec70f3832c5149b6b1de520c8a099 (diff)
Cleanup recently removed flags from ifconfig.c and its manpage.
ok jmc@ mikeb@
Diffstat (limited to 'sbin/ifconfig')
-rw-r--r--sbin/ifconfig/ifconfig.89
-rw-r--r--sbin/ifconfig/ifconfig.c8
2 files changed, 6 insertions, 11 deletions
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 29ea4c1ad88..64fb7d106a0 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifconfig.8,v 1.224 2011/11/27 19:55:18 haesbaert Exp $
+.\" $OpenBSD: ifconfig.8,v 1.225 2011/12/04 06:26:10 haesbaert 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: November 27 2011 $
+.Dd $Mdocdate: December 4 2011 $
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -255,17 +255,12 @@ The device supports IPv4 checksum offload.
As above, for TCP in IPv4 datagrams.
.It Sy CSUM_UDPv4
As above, for UDP.
-.It Sy IPSEC
-The device supports
-.Xr ipsec 4 .
.It Sy VLAN_MTU
MTU can be configured on a per-vlan basis.
.It Sy VLAN_HWTAGGING
On transmit, the device can prepend the
.Xr vlan
tag.
-.It Sy IPCOMP
-The device supports IP compression.
.It Sy CSUM_TCPv6
As CSUM_TCPv4, but supports IPv6 datagrams.
.It Sy CSUM_UDPv6
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index e33f3051392..5477b590c77 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifconfig.c,v 1.252 2011/11/26 23:38:18 haesbaert Exp $ */
+/* $OpenBSD: ifconfig.c,v 1.253 2011/12/04 06:26:10 haesbaert Exp $ */
/* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */
/*
@@ -106,9 +106,9 @@
#include "pbkdf2.h"
#define HWFEATURESBITS \
- "\024\1CSUM_IPv4\2CSUM_TCPv4\3CSUM_UDPv4\4IPSEC" \
- "\5VLAN_MTU\6VLAN_HWTAGGING\7IPCOMP\10CSUM_TCPv6" \
- "\11CSUM_UDPv6\12TCPv4_Rx\13UDPv4_Rx\20WOL"
+ "\024\1CSUM_IPv4\2CSUM_TCPv4\3CSUM_UDPv4" \
+ "\5VLAN_MTU\6VLAN_HWTAGGING\10CSUM_TCPv6" \
+ "\11CSUM_UDPv6\20WOL"
struct ifreq ifr, ridreq;
struct in_aliasreq in_addreq;