Module Name: src
Committed By: christos
Date: Wed Jun 26 15:26:58 UTC 2019
Modified Files:
src/sys/external/bsd/ipf/netinet: fil.c ip_fil.h
Log Message:
Remove fd_local, it is not used, from FreeBSD r349401, reported by Cy Schubert
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/ipf/netinet/fil.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/ipf/netinet/ip_fil.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.26 src/sys/external/bsd/ipf/netinet/fil.c:1.27
--- src/sys/external/bsd/ipf/netinet/fil.c:1.26 Wed Jun 26 11:21:52 2019
+++ src/sys/external/bsd/ipf/netinet/fil.c Wed Jun 26 11:26:57 2019
@@ -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 @@ extern struct timeout ipf_slowtimer_ch;
#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 @@ ipf_resolvedest(ipf_main_softc_t *softc,
}
} 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;
Index: src/sys/external/bsd/ipf/netinet/ip_fil.h
diff -u src/sys/external/bsd/ipf/netinet/ip_fil.h:1.6 src/sys/external/bsd/ipf/netinet/ip_fil.h:1.7
--- src/sys/external/bsd/ipf/netinet/ip_fil.h:1.6 Sun Jun 3 06:37:23 2018
+++ src/sys/external/bsd/ipf/netinet/ip_fil.h Wed Jun 26 11:26:57 2019
@@ -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 @@ typedef struct frdest {
addrfamily_t fd_addr;
fr_dtypes_t fd_type;
int fd_name;
- int fd_local;
} frdest_t;
#define fd_ip6 fd_addr.adf_addr
