diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-12-01 12:46:20 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-12-01 12:46:20 +0000 |
| commit | 3f77d0944006d98d130349a35d3bf65399df67b6 (patch) | |
| tree | f8fd50737ec835829e925262e94d5a46782df75b /usr/src/boot/lib/libstand/net.h | |
| parent | 319ffd7b00d357d8bcc5a3ab337a6a870bf0faa6 (diff) | |
| parent | cd964fce751ca752af4158842063a9579a2d4331 (diff) | |
| download | illumos-joyent-3f77d0944006d98d130349a35d3bf65399df67b6.tar.gz | |
[illumos-gate merge]
commit cd964fce751ca752af4158842063a9579a2d4331
5869 Need AES CMAC support in KCF+PKCS11
commit 6dfcdabd85f09409c5d2f9fb25a3013384ffaf74
8800 loader: use the same option list for dhcp discovery and request
commit dfbc6f2daa6bb8fc06fad985ead27d5db30eab3a
8799 loader: Always issue the pxe request
commit 494a2e4857c10ebf74b8a5652d96466bd9e02f2c
8865 nightly shouldn't depend on specific /usr/bin/egrep behavior
Diffstat (limited to 'usr/src/boot/lib/libstand/net.h')
| -rw-r--r-- | usr/src/boot/lib/libstand/net.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr/src/boot/lib/libstand/net.h b/usr/src/boot/lib/libstand/net.h index 14b84f0590..87228f5592 100644 --- a/usr/src/boot/lib/libstand/net.h +++ b/usr/src/boot/lib/libstand/net.h @@ -1,5 +1,3 @@ -/* $NetBSD: net.h,v 1.10 1995/10/20 00:46:30 cgd Exp $ */ - /* * Copyright (c) 1993 Adam Glass * Copyright (c) 1992 Regents of the University of California. @@ -17,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -32,8 +30,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _STAND_NET_H @@ -120,7 +116,7 @@ ssize_t sendrecv(struct iodesc *, void **, void **); /* bootp/DHCP */ -void bootp(int, int); +void bootp(int); /* Utilities: */ char *ether_sprintf(u_char *); |