Source-Changes-HG archive

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

[src/trunk]: src/sys/external/bsd/ipf/netinet Remove fd_local, it is not used...



details:   https://anonhg.NetBSD.org/src/rev/376f4e14fca3
branches:  trunk
changeset: 962090:376f4e14fca3
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jun 26 15:26:57 2019 +0000

description:
Remove fd_local, it is not used, from FreeBSD r349401, reported by Cy Schubert

diffstat:

 sys/external/bsd/ipf/netinet/fil.c    |  9 ++-------
 sys/external/bsd/ipf/netinet/ip_fil.h |  3 +--
 2 files changed, 3 insertions(+), 9 deletions(-)

diffs (47 lines):

diff -r 5ff94f732410 -r 376f4e14fca3 sys/external/bsd/ipf/netinet/fil.c
--- a/sys/external/bsd/ipf/netinet/fil.c        Wed Jun 26 15:21:52 2019 +0000
+++ b/sys/external/bsd/ipf/netinet/fil.c        Wed Jun 26 15:26:57 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fil.c,v 1.26 2019/06/26 15:21:52 christos Exp $        */
+/*     $NetBSD: fil.c,v 1.27 2019/06/26 15:26:57 christos Exp $        */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -141,7 +141,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.26 2019/06/26 15:21:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.27 2019/06/26 15:26:57 christos Exp $");
 #else
 static const char sccsid[] = "@(#)fil.c        1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -7282,11 +7282,6 @@
                        }
                } else {
                        ifp = GETIFP(base + fdp->fd_name, v);
-                       if (ifp == NULL)
-                               ifp = (void *)-1;
-                       if ((ifp != NULL) && (ifp != (void *)-1))
-                               fdp->fd_local = ipf_deliverlocal(softc, v, ifp,
-                                                                &fdp->fd_ip6);
                }
        }
        fdp->fd_ptr = ifp;
diff -r 5ff94f732410 -r 376f4e14fca3 sys/external/bsd/ipf/netinet/ip_fil.h
--- a/sys/external/bsd/ipf/netinet/ip_fil.h     Wed Jun 26 15:21:52 2019 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_fil.h     Wed Jun 26 15:26:57 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil.h,v 1.6 2018/06/03 10:37:23 maxv Exp $  */
+/*     $NetBSD: ip_fil.h,v 1.7 2019/06/26 15:26:57 christos Exp $      */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -576,7 +576,6 @@
        addrfamily_t    fd_addr;
        fr_dtypes_t     fd_type;
        int             fd_name;
-       int             fd_local;
 } frdest_t;
 
 #define        fd_ip6  fd_addr.adf_addr



Home | Main Index | Thread Index | Old Index