diff options
| author | wollman <wollman@FreeBSD.org> | 1995-09-21 17:19:28 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-09-21 17:19:28 +0000 |
| commit | 2e2040e424a06b015c95c38b05e4925a2398ab10 (patch) | |
| tree | 85f8c679233d5ba68aec0828022d9a9e2241e485 /sys/netinet/if_ether.h | |
| parent | 15d56af06f069a1f8dc3a8a4b106b91a3d249f96 (diff) | |
| download | FreeBSD-src-2e2040e424a06b015c95c38b05e4925a2398ab10.zip FreeBSD-src-2e2040e424a06b015c95c38b05e4925a2398ab10.tar.gz | |
Second try: get 4.4-Lite-2 into the source tree. The conflicts don't
matter because none of our working source files are on the CSRG branch
any more.
Obtained from: 4.4BSD-Lite-2
Diffstat (limited to 'sys/netinet/if_ether.h')
| -rw-r--r-- | sys/netinet/if_ether.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index 6b4def0..8d44bf5 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -30,7 +30,7 @@ * 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 + * @(#)if_ether.h 8.3 (Berkeley) 5/2/95 */ /* @@ -142,14 +142,12 @@ u_char ether_ipmulticast_min[6]; u_char ether_ipmulticast_max[6]; struct ifqueue arpintrq; -struct llinfo_arp *arptnew __P((struct in_addr *)); struct llinfo_arp llinfo_arp; /* head of the llinfo queue */ -void arpwhohas __P((struct arpcom *, struct in_addr *)); +void arp_rtrequest __P((int, struct rtentry *, struct sockaddr *)); void arpintr __P((void)); int arpresolve __P((struct arpcom *, - struct rtentry *, struct mbuf *, struct sockaddr *, u_char *)); -void arp_rtrequest __P((int, struct rtentry *, struct sockaddr *)); + struct rtentry *, struct mbuf *, struct sockaddr *, u_char *)); void arpwhohas __P((struct arpcom *, struct in_addr *)); int ether_addmulti __P((struct ifreq *, struct arpcom *)); |
