Permalink
Browse files

removed unnecesarry structure members.

  • Loading branch information...
keiichi
keiichi committed Jan 9, 2004
1 parent 220d9e0 commit d133256283512c9850333d2e1d53f7535bcb8fe5
Showing with 3 additions and 29 deletions.
  1. +1 −17 kame/sys/netinet6/ip6_output.c
  2. +1 −9 kame/sys/netinet6/mip6_cncore.c
  3. +1 −3 kame/sys/netinet6/mip6_var.h
@@ -1,4 +1,4 @@
-/* $KAME: ip6_output.c,v 1.409 2003/12/24 09:10:07 suz Exp $ */
+/* $KAME: ip6_output.c,v 1.410 2004/01/09 11:05:26 keiichi Exp $ */
/*
* Copyright (c) 2002 INRIA. All rights reserved.
@@ -459,22 +459,6 @@ ip6_output(m0, opt, ro, flags, im6o, ifpp)
if (mip6opt.mip6po_haddr != NULL)
have_hao = 1;
MAKE_EXTHDR(mip6opt.mip6po_haddr, &exthdrs.ip6e_haddr);
- /*
- * add a mobility header only when there is no
- * mobility header specified by the caller of
- * ip6_output().
- */
- if ((mip6opt.mip6po_mobility != NULL) &&
- (exthdrs.ip6e_mh == NULL)) {
- /*
- * insert a mobility header created by
- * mip6_exthdr_create() only if no mobility
- * header is specified by the ip6_output()
- * caller.
- */
- MAKE_EXTHDR(mip6opt.mip6po_mobility,
- &exthdrs.ip6e_mh);
- }
} else {
/*
* this is a forwarded packet. do not modify any
@@ -1,4 +1,4 @@
-/* $KAME: mip6_cncore.c,v 1.56 2003/12/17 07:52:36 keiichi Exp $ */
+/* $KAME: mip6_cncore.c,v 1.57 2004/01/09 11:05:26 keiichi Exp $ */
/*
* Copyright (C) 2003 WIDE Project. All rights reserved.
@@ -535,8 +535,6 @@ mip6_exthdr_create(m, opt, mip6opt)
mip6opt->mip6po_rthdr2 = NULL;
mip6opt->mip6po_haddr = NULL;
- mip6opt->mip6po_dest2 = NULL;
- mip6opt->mip6po_mobility = NULL;
ip6 = mtod(m, struct ip6_hdr *);
if (ip6_getpktaddrs(m, &src, &dst))
@@ -745,12 +743,6 @@ mip6_destopt_discard(mip6opt)
if (mip6opt->mip6po_haddr)
FREE(mip6opt->mip6po_haddr, M_IP6OPT);
- if (mip6opt->mip6po_dest2)
- FREE(mip6opt->mip6po_dest2, M_IP6OPT);
-
- if (mip6opt->mip6po_mobility)
- FREE(mip6opt->mip6po_mobility, M_IP6OPT);
-
return;
}
@@ -1,4 +1,4 @@
-/* $KAME: mip6_var.h,v 1.111 2003/12/10 21:25:22 t-momose Exp $ */
+/* $KAME: mip6_var.h,v 1.112 2004/01/09 11:05:26 keiichi Exp $ */
/*
* Copyright (C) 2001 WIDE Project. All rights reserved.
@@ -298,8 +298,6 @@ LIST_HEAD(mip6_prefix_list, mip6_prefix);
struct mip6_pktopts {
struct ip6_rthdr *mip6po_rthdr2;
struct ip6_dest *mip6po_haddr;
- struct ip6_dest *mip6po_dest2;
- struct ip6_mobility *mip6po_mobility;
};
struct mip6_mobility_options {

0 comments on commit d133256

Please sign in to comment.