summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/netinet6/frag6.c4
-rw-r--r--sys/netinet6/ip6_forward.c2
-rw-r--r--sys/netinet6/ip6_input.c2
3 files changed, 1 insertions, 7 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index fd05c9f..9826f6b 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -683,10 +683,6 @@ frag6_slowtimo(void)
{
struct ip6q *q6;
-#if 0
- GIANT_REQUIRED; /* XXX bz: ip6_forward_rt */
-#endif
-
IP6Q_LOCK();
q6 = ip6q.ip6q_next;
if (q6)
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index e335be8..8bf0595 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -106,7 +106,7 @@ ip6_forward(struct mbuf *m, int srcrt)
#endif
char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
- GIANT_REQUIRED; /* XXX bz: ip6_forward_rt */
+ /* GIANT_REQUIRED; */ /* XXX bz: ip6_forward_rt */
#ifdef IPSEC
/*
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 89b2760..50fca58 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -222,8 +222,6 @@ ip6_input(struct mbuf *m)
struct in6_addr odst;
int srcrt = 0;
- GIANT_REQUIRED; /* XXX for now */
-
#ifdef IPSEC
/*
* should the inner packet be considered authentic?
OpenPOWER on IntegriCloud