svn commit: r349655 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Wed Jul  3 17:09:41 2019
New Revision: 349655
URL: https://svnweb.freebsd.org/changeset/base/349655

Log:
  MFC r349401:
  
  While working on PR/238796 I discovered an unused variable in frdest,
  the next hop structure. It is likely this contributes to PR/238796
  though other factors remain to be investigated.
  
  PR:		238796

Modified:
  stable/12/sys/contrib/ipfilter/netinet/fil.c
  stable/12/sys/contrib/ipfilter/netinet/ip_fil.h
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/contrib/ipfilter/netinet/fil.c
  stable/11/sys/contrib/ipfilter/netinet/ip_fil.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/contrib/ipfilter/netinet/fil.c
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/fil.c	Wed Jul  3 17:04:44 2019	(r349654)
+++ stable/12/sys/contrib/ipfilter/netinet/fil.c	Wed Jul  3 17:09:41 2019	(r349655)
@@ -7480,10 +7480,6 @@ ipf_resolvedest(softc, base, fdp, v)
 	}
 	fdp->fd_ptr = ifp;
 
-	if ((ifp != NULL) && (ifp != (void *)-1)) {
-		fdp->fd_local = ipf_deliverlocal(softc, v, ifp, &fdp->fd_ip6);
-	}
-
 	return errval;
 }
 

Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil.h
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/ip_fil.h	Wed Jul  3 17:04:44 2019	(r349654)
+++ stable/12/sys/contrib/ipfilter/netinet/ip_fil.h	Wed Jul  3 17:09:41 2019	(r349655)
@@ -560,7 +560,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