Kill unused route storages.

blambert@, henning@, lteo@

diff --git a/sys/net/if_gif.h b/sys/net/if_gif.h
index a1e8dd6..469be32 100644 (file)
--- a/sys/net/if_gif.h
+++ b/sys/net/if_gif.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_gif.h,v 1.10 2009/11/21 14:08:14 claudio Exp $     */
+/*     $OpenBSD: if_gif.h,v 1.11 2014/07/09 15:35:53 mpi Exp $ */
 /*     $KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $       */
 
 /*
@@ -37,30 +37,14 @@
 #ifndef _NET_IF_GIF_H_
 #define _NET_IF_GIF_H_
 
-
-#include <netinet/in.h>
-/* XXX sigh, why route have struct route instead of pointer? */
-
 struct gif_softc {
        struct ifnet    gif_if;    /* common area */
        struct sockaddr *gif_psrc; /* Physical src addr */
        struct sockaddr *gif_pdst; /* Physical dst addr */
-       union {
-               struct route  gifscr_ro;    /* xxx */
-#ifdef INET6
-               struct route_in6 gifscr_ro6; /* xxx */
-#endif
-       } gifsc_gifscr;
-       int             gif_flags;
        u_int           gif_rtableid;
        LIST_ENTRY(gif_softc) gif_list; /* list of all gifs */
 };
 
-#define gif_ro gifsc_gifscr.gifscr_ro
-#ifdef INET6
-#define gif_ro6 gifsc_gifscr.gifscr_ro6
-#endif
-
 #define GIF_MTU                (1280)  /* Default MTU */
 #define        GIF_MTU_MIN     (1280)  /* Minimum MTU */
 #define        GIF_MTU_MAX     (8192)  /* Maximum MTU */

diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
index 58e8e5b..184ebae 100644 (file)
--- a/sys/netinet6/ip6_mroute.h
+++ b/sys/netinet6/ip6_mroute.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip6_mroute.h,v 1.13 2013/10/29 19:05:45 deraadt Exp $ */
+/*     $OpenBSD: ip6_mroute.h,v 1.14 2014/07/09 15:35:53 mpi Exp $     */
 /*     $KAME: ip6_mroute.h,v 1.17 2001/02/10 02:05:52 itojun Exp $     */
 
 /*
@@ -180,7 +180,6 @@ struct mif6 {
        u_int64_t       m6_pkt_out;     /* # pkts out on interface           */
        u_int64_t       m6_bytes_in;    /* # bytes in on interface           */
        u_int64_t       m6_bytes_out;   /* # bytes out on interface          */
-       struct route_in6 m6_route;/* cached route if this is a tunnel */
 };
 
 /*