# HG changeset patch # User ss146032 # Date 1137603859 28800 # Node ID 317cceffd26dc72a1acc89713b223163eed7332c # Parent 17aa1390b9f07becd43c796775f2b65f6c7acacc 6372261 Lint error generated from putback of 6216419 diff -r 17aa1390b9f0 -r 317cceffd26d usr/src/stand/lib/fs/nfs/mount.c --- a/usr/src/stand/lib/fs/nfs/mount.c Tue Jan 17 21:18:31 2006 -0800 +++ b/usr/src/stand/lib/fs/nfs/mount.c Wed Jan 18 09:04:19 2006 -0800 @@ -76,7 +76,6 @@ static gid_t fake_gids = 1; /* fake gids list for auth_unix */ extern void set_default_filename(char *); /* boot.c */ -extern void mac_set_arp_timeout(unsigned int); /* mac.c */ /* * xdr routines used by mount. diff -r 17aa1390b9f0 -r 317cceffd26d usr/src/stand/lib/inet/mac.c --- a/usr/src/stand/lib/inet/mac.c Tue Jan 17 21:18:31 2006 -0800 +++ b/usr/src/stand/lib/inet/mac.c Wed Jan 18 09:04:19 2006 -0800 @@ -71,8 +71,6 @@ }; #endif /* !__i386 */ -void mac_set_arp_timeout(unsigned int); - /* * given the mac type, initialize the mac interface state. */ diff -r 17aa1390b9f0 -r 317cceffd26d usr/src/stand/lib/inet/mac.h --- a/usr/src/stand/lib/inet/mac.h Tue Jan 17 21:18:31 2006 -0800 +++ b/usr/src/stand/lib/inet/mac.h Wed Jan 18 09:04:19 2006 -0800 @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,8 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 1990-1999, 2001-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * * mac.h contains MAC layer independent definttions @@ -48,6 +48,7 @@ extern int mac_get_arp(struct in_addr *, void *, int, uint32_t); extern int mac_get_dev(void); extern uint8_t mac_arp_type(uint8_t); +extern void mac_set_arp_timeout(unsigned int); extern struct mac_type mac_state; /* in mac.c */ #ifdef __cplusplus