summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/ifconfig/brconfig.h4
-rw-r--r--sbin/ifconfig/ifconfig.814
-rw-r--r--sbin/ifconfig/ifconfig.c6
3 files changed, 19 insertions, 5 deletions
diff --git a/sbin/ifconfig/brconfig.h b/sbin/ifconfig/brconfig.h
index 84d220b3b9c..8d3471686a6 100644
--- a/sbin/ifconfig/brconfig.h
+++ b/sbin/ifconfig/brconfig.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: brconfig.h,v 1.3 2010/06/07 15:05:42 jsg Exp $ */
+/* $OpenBSD: brconfig.h,v 1.4 2011/03/13 15:31:41 stsp Exp $ */
/*
* Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org>
@@ -68,7 +68,7 @@ int bridge_rule(int, char **, int);
#define IFFBITS \
"\024\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5POINTOPOINT\6NOTRAILERS\7RUNNING\10NOARP\
-\11PROMISC\12ALLMULTI\13OACTIVE\14SIMPLEX\15LINK0\16LINK1\17LINK2\20MULTICAST\21TXREADY\22NOINET6\23INET6_PRIVACY\24MPLS"
+\11PROMISC\12ALLMULTI\13OACTIVE\14SIMPLEX\15LINK0\16LINK1\17LINK2\20MULTICAST\21TXREADY\22NOINET6\23INET6_PRIVACY\24MPLS\25WOL"
void printb(char *, unsigned int, char *);
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 2a36956c858..cacf502e81d 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifconfig.8,v 1.213 2011/02/17 08:32:29 camield Exp $
+.\" $OpenBSD: ifconfig.8,v 1.214 2011/03/13 15:31:41 stsp 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: February 17 2011 $
+.Dd $Mdocdate: March 13 2011 $
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -435,6 +435,16 @@ This may be used to enable an interface after an
It happens automatically when setting the first address on an interface.
If the interface was reset when previously marked down,
the hardware will be re-initialized.
+.Pp
+.It Cm wol
+Enable Wake On LAN (WOL).
+When enabled, reception of a WOL frame will cause the network card to
+power up the system from standby or suspend mode.
+WOL frames can be sent using
+.Xr arp 8 .
+.It Fl wol
+Disable WOL.
+WOL is disabled at boot by the driver, if possible.
.El
.Pp
.Nm
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 332f84facbf..31cbe30ac0a 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifconfig.c,v 1.244 2011/03/01 09:37:31 claudio Exp $ */
+/* $OpenBSD: ifconfig.c,v 1.245 2011/03/13 15:31:41 stsp Exp $ */
/* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */
/*
@@ -461,6 +461,8 @@ const struct cmd {
{ "descr", NEXTARG, 0, setifdesc },
{ "-description", 1, 0, unsetifdesc },
{ "-descr", 1, 0, unsetifdesc },
+ { "wol", IFXF_WOL, 0, setifxflags },
+ { "-wol", -IFXF_WOL, 0, setifxflags },
#else /* SMALL */
{ "group", NEXTARG, 0, setignore },
{ "powersave", NEXTARG0, 0, setignore },
@@ -474,6 +476,8 @@ const struct cmd {
{ "-inet6", IFXF_NOINET6, 0, setignore } ,
{ "description", NEXTARG, 0, setignore },
{ "descr", NEXTARG, 0, setignore },
+ { "wol", IFXF_WOL, 0, setignore },
+ { "-wol", -IFXF_WOL, 0, setignore },
#endif /* SMALL */
#if 0
/* XXX `create' special-cased below */