diff options
| author |   mpi <mpi@openbsd.org> | 2015-09-09 14:02:29 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-09-09 14:02:29 +0000 |
| commit | 88c6aee1e955ad7b29144359b4eed853ba798d28 (patch) | |
| tree | 0112716a8ebdffce70ce524b4c52a8c3a1765445 | |
| parent | No need to check !xxboot inside a 'if (!xxboot) ...' block. (diff) | |
| download | wireguard-openbsd-88c6aee1e955ad7b29144359b4eed853ba798d28.tar.xz wireguard-openbsd-88c6aee1e955ad7b29144359b4eed853ba798d28.zip | |
Kill some commented out in6_ifstat_inc().
| -rw-r--r-- | sys/netinet6/frag6.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/ip6_forward.c | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index f9ddb83db97..37fcda27a88 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frag6.c,v 1.61 2015/07/08 07:31:14 mpi Exp $ */ +/* $OpenBSD: frag6.c,v 1.62 2015/09/09 14:02:29 mpi Exp $ */ /* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */ /* @@ -632,7 +632,6 @@ frag6_slowtimo(void) TAILQ_FOREACH_SAFE(q6, &frag6_queue, ip6q_queue, nq6) if (--q6->ip6q_ttl == 0) { ip6stat.ip6s_fragtimeout++; - /* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */ frag6_freef(q6); } @@ -644,7 +643,6 @@ frag6_slowtimo(void) while (frag6_nfragpackets > (u_int)ip6_maxfragpackets && !TAILQ_EMPTY(&frag6_queue)) { ip6stat.ip6s_fragoverflow++; - /* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */ frag6_freef(TAILQ_LAST(&frag6_queue, ip6q_head)); } IP6Q_UNLOCK(); @@ -674,7 +672,6 @@ frag6_drain(void) return; while ((q6 = TAILQ_FIRST(&frag6_queue)) != NULL) { ip6stat.ip6s_fragdropped++; - /* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */ frag6_freef(q6); } IP6Q_UNLOCK(); diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 4b7e1374a53..111b7fe2c5c 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_forward.c,v 1.80 2015/08/31 07:17:12 mpi Exp $ */ +/* $OpenBSD: ip6_forward.c,v 1.81 2015/09/09 14:02:29 mpi Exp $ */ /* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */ /* @@ -115,7 +115,6 @@ ip6_forward(struct mbuf *m, int srcrt) IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst) || IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src)) { ip6stat.ip6s_cantforward++; - /* XXX in6_ifstat_inc(rt->rt_ifp, ifs6_in_discard) */ if (ip6_log_time + ip6_log_interval < time_second) { ip6_log_time = time_second; inet_ntop(AF_INET6, &ip6->ip6_src, src6, sizeof(src6)); @@ -132,7 +131,6 @@ ip6_forward(struct mbuf *m, int srcrt) } if (ip6->ip6_hlim <= IPV6_HLIMDEC) { - /* XXX in6_ifstat_inc(rt->rt_ifp, ifs6_in_discard) */ icmp6_error(m, ICMP6_TIME_EXCEEDED, ICMP6_TIME_EXCEED_TRANSIT, 0); return; @@ -242,7 +240,6 @@ reroute: if (ip6_forward_rt.ro_rt == NULL) { ip6stat.ip6s_noroute++; - /* XXX in6_ifstat_inc(rt->rt_ifp, ifs6_in_noroute) */ if (mcopy) { icmp6_error(mcopy, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOROUTE, 0); @@ -270,7 +267,6 @@ reroute: if (ip6_forward_rt.ro_rt == NULL) { ip6stat.ip6s_noroute++; - /* XXX in6_ifstat_inc(rt->rt_ifp, ifs6_in_noroute) */ if (mcopy) { icmp6_error(mcopy, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOROUTE, 0); |