Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Remove remnants of AF_IMPLINK.



details:   https://anonhg.NetBSD.org/src/rev/68f0bd9ec6e8
branches:  trunk
changeset: 784677:68f0bd9ec6e8
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Feb 05 17:30:01 2013 +0000

description:
Remove remnants of AF_IMPLINK.

diffstat:

 lib/libc/sys/socket.2 |   5 ++---
 sys/net/if_fddisubr.c |  40 +++-------------------------------------
 sys/netinet/raw_ip.c  |  10 ++++------
 3 files changed, 9 insertions(+), 46 deletions(-)

diffs (132 lines):

diff -r d3a1aa2a7787 -r 68f0bd9ec6e8 lib/libc/sys/socket.2
--- a/lib/libc/sys/socket.2     Tue Feb 05 16:57:07 2013 +0000
+++ b/lib/libc/sys/socket.2     Tue Feb 05 17:30:01 2013 +0000
@@ -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_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
diff -r d3a1aa2a7787 -r 68f0bd9ec6e8 sys/net/if_fddisubr.c
--- a/sys/net/if_fddisubr.c     Tue Feb 05 16:57:07 2013 +0000
+++ b/sys/net/if_fddisubr.c     Tue Feb 05 17:30:01 2013 +0000
@@ -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 @@
                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 @@
                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
diff -r d3a1aa2a7787 -r 68f0bd9ec6e8 sys/netinet/raw_ip.c
--- a/sys/netinet/raw_ip.c      Tue Feb 05 16:57:07 2013 +0000
+++ b/sys/netinet/raw_ip.c      Tue Feb 05 17:30:01 2013 +0000
@@ -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 @@
                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 @@
                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);



Home | Main Index | Thread Index | Old Index