Module Name: src
Committed By: joerg
Date: Tue Feb 5 17:30:02 UTC 2013
Modified Files:
src/lib/libc/sys: socket.2
src/sys/net: if_fddisubr.c
src/sys/netinet: raw_ip.c
Log Message:
Remove remnants of AF_IMPLINK.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/lib/libc/sys/socket.2
cvs rdiff -u -r1.82 -r1.83 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.114 -r1.115 src/sys/netinet/raw_ip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/sys/socket.2
diff -u src/lib/libc/sys/socket.2:1.39 src/lib/libc/sys/socket.2:1.40
--- src/lib/libc/sys/socket.2:1.39 Wed Jan 25 09:18:52 2012
+++ src/lib/libc/sys/socket.2 Tue Feb 5 17:30:01 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: socket.2,v 1.39 2012/01/25 09:18:52 wiz Exp $
+.\" $NetBSD: socket.2,v 1.40 2013/02/05 17:30:01 joerg Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)socket.2 8.1 (Berkeley) 6/4/93
.\"
-.Dd January 23, 2012
+.Dd February 5, 2013
.Dt SOCKET 2
.Os
.Sh NAME
@@ -60,7 +60,6 @@ PF_INET ARPA Internet protocols
PF_INET6 IPv6 (Internet Protocol version 6) protocols
PF_ISO ISO protocols
PF_NS Xerox Network Systems protocols
-PF_IMPLINK IMP \*(lqhost at IMP\*(rq link layer
PF_APPLETALK AppleTalk protocols
PF_BLUETOOTH Bluetooth protocols
.Ed
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.82 src/sys/net/if_fddisubr.c:1.83
--- src/sys/net/if_fddisubr.c:1.82 Thu Oct 11 20:05:50 2012
+++ src/sys/net/if_fddisubr.c Tue Feb 5 17:30:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.82 2012/10/11 20:05:50 christos Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.83 2013/02/05 17:30:02 joerg Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.82 2012/10/11 20:05:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.83 2013/02/05 17:30:02 joerg Exp $");
#include "opt_gateway.h"
#include "opt_inet.h"
@@ -443,39 +443,6 @@ fddi_output(struct ifnet *ifp0, struct m
break;
}
- case AF_IMPLINK:
- {
- fh = mtod(m, struct fddi_header *);
- error = EPROTONOSUPPORT;
- switch (fh->fddi_fc & (FDDIFC_C|FDDIFC_L|FDDIFC_F)) {
- case FDDIFC_LLC_ASYNC: {
- /* legal priorities are 0 through 7 */
- if ((fh->fddi_fc & FDDIFC_Z) > 7)
- goto bad;
- break;
- }
- case FDDIFC_LLC_SYNC: {
- /* FDDIFC_Z bits reserved, must be zero */
- if (fh->fddi_fc & FDDIFC_Z)
- goto bad;
- break;
- }
- case FDDIFC_SMT: {
- /* FDDIFC_Z bits must be non zero */
- if ((fh->fddi_fc & FDDIFC_Z) == 0)
- goto bad;
- break;
- }
- default: {
- /* anything else is too dangerous */
- goto bad;
- }
- }
- error = 0;
- if (fh->fddi_dhost[0] & 1)
- m->m_flags |= (M_BCAST|M_MCAST);
- goto queue_it;
- }
default:
printf("%s: can't handle af%d\n", ifp->if_xname,
dst->sa_family);
@@ -505,8 +472,7 @@ fddi_output(struct ifnet *ifp0, struct m
senderr(ENOBUFS);
fh = mtod(m, struct fddi_header *);
fh->fddi_fc = FDDIFC_LLC_ASYNC|FDDIFC_LLC_PRIO4;
- memcpy(fh->fddi_dhost, edst, sizeof (edst));
- queue_it:
+ memcpy(fh->fddi_dhost, edst, sizeof (edst));
if (hdrcmplt)
memcpy(fh->fddi_shost, esrc, sizeof(fh->fddi_shost));
else
Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.114 src/sys/netinet/raw_ip.c:1.115
--- src/sys/netinet/raw_ip.c:1.114 Thu Mar 22 20:34:39 2012
+++ src/sys/netinet/raw_ip.c Tue Feb 5 17:30:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.114 2012/03/22 20:34:39 drochner Exp $ */
+/* $NetBSD: raw_ip.c,v 1.115 2013/02/05 17:30:02 joerg Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.114 2012/03/22 20:34:39 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.115 2013/02/05 17:30:02 joerg Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -478,8 +478,7 @@ rip_bind(struct inpcb *inp, struct mbuf
return (EINVAL);
if (TAILQ_FIRST(&ifnet) == 0)
return (EADDRNOTAVAIL);
- if (addr->sin_family != AF_INET &&
- addr->sin_family != AF_IMPLINK)
+ if (addr->sin_family != AF_INET)
return (EAFNOSUPPORT);
if (!in_nullhost(addr->sin_addr) &&
ifa_ifwithaddr(sintosa(addr)) == 0)
@@ -497,8 +496,7 @@ rip_connect(struct inpcb *inp, struct mb
return (EINVAL);
if (TAILQ_FIRST(&ifnet) == 0)
return (EADDRNOTAVAIL);
- if (addr->sin_family != AF_INET &&
- addr->sin_family != AF_IMPLINK)
+ if (addr->sin_family != AF_INET)
return (EAFNOSUPPORT);
inp->inp_faddr = addr->sin_addr;
return (0);
