[src/trunk]: src/sys/netinet6 make IFA_STATS really work on IPv6.

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

details:   https://anonhg.NetBSD.org/src/rev/1d293f631bdf
branches:  trunk
changeset: 498408:1d293f631bdf
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon Oct 23 03:45:25 2000 +0000

description:
make IFA_STATS really work on IPv6.

diffstat:

 sys/netinet6/ip6_input.c  |   4 ++--
 sys/netinet6/ip6_output.c |  30 +++++++++++++-----------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diffs (69 lines):

diff -r ff0f35669275 -r 1d293f631bdf sys/netinet6/ip6_input.c
--- a/sys/netinet6/ip6_input.c  Mon Oct 23 03:42:18 2000 +0000
+++ b/sys/netinet6/ip6_input.c  Mon Oct 23 03:45:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_input.c,v 1.27 2000/08/31 07:35:44 itojun Exp $    */
+/*     $NetBSD: ip6_input.c,v 1.28 2000/10/23 03:45:25 itojun Exp $    */
 /*     $KAME: ip6_input.c,v 1.121 2000/08/31 06:07:29 itojun Exp $     */
 
 /*
@@ -688,7 +688,7 @@
         * Tell launch routine the next header
         */
 #ifdef IFA_STATS
-       if (IFA_STATS && deliverifp != NULL) {
+       if (deliverifp != NULL) {
                struct in6_ifaddr *ia6;
                ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
                if (ia6)
diff -r ff0f35669275 -r 1d293f631bdf sys/netinet6/ip6_output.c
--- a/sys/netinet6/ip6_output.c Mon Oct 23 03:42:18 2000 +0000
+++ b/sys/netinet6/ip6_output.c Mon Oct 23 03:45:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_output.c,v 1.25 2000/08/19 08:15:54 itojun Exp $   */
+/*     $NetBSD: ip6_output.c,v 1.26 2000/10/23 03:45:25 itojun Exp $   */
 /*     $KAME: ip6_output.c,v 1.122 2000/08/19 02:12:02 jinmei Exp $    */
 
 /*
@@ -863,14 +863,12 @@
            )
        {
 #ifdef IFA_STATS
-               if (IFA_STATS) {
-                       struct in6_ifaddr *ia6;
-                       ip6 = mtod(m, struct ip6_hdr *);
-                       ia6 = in6_ifawithifp(ifp, &ip6->ip6_src);
-                       if (ia6) {
-                               ia->ia_ifa.ifa_data.ifad_outbytes +=
-                                       m->m_pkthdr.len;
-                       }
+               struct in6_ifaddr *ia6;
+               ip6 = mtod(m, struct ip6_hdr *);
+               ia6 = in6_ifawithifp(ifp, &ip6->ip6_src);
+               if (ia6) {
+                       ia6->ia_ifa.ifa_data.ifad_outbytes +=
+                               m->m_pkthdr.len;
                }
 #endif
 #ifdef OLDIP6OUTPUT
@@ -995,14 +993,12 @@
                m->m_nextpkt = 0;
                if (error == 0) {
 #ifdef IFA_STATS
-                       if (IFA_STATS) {
-                               struct in6_ifaddr *ia6;
-                               ip6 = mtod(m, struct ip6_hdr *);
-                               ia6 = in6_ifawithifp(ifp, &ip6->ip6_src);
-                               if (ia6) {
-                                       ia->ia_ifa.ifa_data.ifad_outbytes +=
-                                               m->m_pkthdr.len;
-                               }
+                       struct in6_ifaddr *ia6;
+                       ip6 = mtod(m, struct ip6_hdr *);
+                       ia6 = in6_ifawithifp(ifp, &ip6->ip6_src);
+                       if (ia6) {
+                               ia6->ia_ifa.ifa_data.ifad_outbytes +=
+                                       m->m_pkthdr.len;
                        }
 #endif
 #ifdef OLDIP6OUTPUT