[src/trunk]: src/sys/external/bsd/ipf/netinet Remove unused variable and ifde...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d992bbce78e9
branches:  trunk
changeset: 789955:d992bbce78e9
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Sep 14 11:39:08 2013 +0000

description:
Remove unused variable and ifdef another like their use

diffstat:

 sys/external/bsd/ipf/netinet/ip_fil_netbsd.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 6ca47ed2af8b -r d992bbce78e9 sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
--- a/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c      Sat Sep 14 11:33:59 2013 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c      Sat Sep 14 11:39:08 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_fil_netbsd.c,v 1.5 2013/06/29 21:06:57 rmind Exp $  */
+/*     $NetBSD: ip_fil_netbsd.c,v 1.6 2013/09/14 11:39:08 martin Exp $ */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -8,7 +8,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.5 2013/06/29 21:06:57 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.6 2013/09/14 11:39:08 martin Exp $");
 #else
 static const char sccsid[] = "@(#)ip_fil.c     2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
@@ -1347,13 +1347,11 @@
 # endif
        struct rtentry *rt;
        struct ifnet *ifp;
-       frentry_t *fr;
        u_long mtu;
        int error;
 
        error = 0;
        ro = &ip6route;
-       fr = fin->fin_fr;
 
        if (fdp != NULL)
                ifp = fdp->fd_ptr;
@@ -1404,7 +1402,7 @@
 # endif
 
        {
-# if (__NetBSD_Version__ >= 106010000)
+# if (__NetBSD_Version__ >= 106010000) && !defined(IN6_LINKMTU)
                struct in6_ifextra *ife;
 # endif
                if (rt->rt_flags & RTF_GATEWAY)
@@ -1419,10 +1417,10 @@
 # if (__NetBSD_Version__ <= 106009999)
                mtu = nd_ifinfo[ifp->if_index].linkmtu;
 # else
-               ife = (struct in6_ifextra *)(ifp)->if_afdata[AF_INET6];
 #  ifdef IN6_LINKMTU
                mtu = IN6_LINKMTU(ifp);
 #  else
+               ife = (struct in6_ifextra *)(ifp)->if_afdata[AF_INET6];
                mtu = ife->nd_ifinfo[ifp->if_index].linkmtu;
 #  endif
 # endif