From ef91e5283ed2b5d0fd9e5043e1c6fc451ff30bf9 Mon Sep 17 00:00:00 2001 From: Garrett Wollman Date: Thu, 21 Sep 1995 17:39:51 +0000 Subject: [PATCH] Merge with 4.4-Lite-2. This involves changing the version number and moving a declaration around. Obtained from: 4.4BSD-Lite-2 --- sys/netinet/if_ether.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index 2551fe37811..17d71b5a090 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -30,8 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)if_ether.h 8.1 (Berkeley) 6/10/93 - * $Id: if_ether.h,v 1.8 1995/04/02 01:26:26 wpaul Exp $ + * @(#)if_ether.h 8.3 (Berkeley) 5/2/95 + * $Id: if_ether.h,v 1.9 1995/05/30 08:09:20 rgrimes Exp $ */ #ifndef _NETINET_IF_ETHER_H_ @@ -156,10 +156,10 @@ extern struct ifqueue arpintrq; struct llinfo_arp *arptnew __P((struct in_addr *)); extern struct llinfo_arp llinfo_arp; /* head of the llinfo queue */ -void arpwhohas __P((struct arpcom *, struct in_addr *)); void arpintr __P((void)); int arpresolve __P((struct arpcom *, struct rtentry *, struct mbuf *, struct sockaddr *, u_char *, struct rtentry *)); +void arpwhohas __P((struct arpcom *, struct in_addr *)); void arp_ifinit __P((struct arpcom *, struct ifaddr *)); int ether_addmulti __P((struct ifreq *, struct arpcom *));