CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Mon Apr 11 08:26:33 UTC 2016

Modified Files:
        src/sys/net: route.c

Log Message:
Remove out-dated comments and unnecessary splsoftnet for pool_{get,put}


To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/net/route.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.160 src/sys/net/route.c:1.161
--- src/sys/net/route.c:1.160	Thu Apr  7 04:04:47 2016
+++ src/sys/net/route.c	Mon Apr 11 08:26:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.160 2016/04/07 04:04:47 christos Exp $	*/
+/*	$NetBSD: route.c,v 1.161 2016/04/11 08:26:33 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.160 2016/04/07 04:04:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.161 2016/04/11 08:26:33 ozaki-r Exp $");
 
 #include <sys/param.h>
 #ifdef RTFLUSH_DEBUG
@@ -796,7 +796,6 @@ rtrequest1(int req, struct rt_addrinfo *
 		if (info->rti_ifa == NULL && (error = rt_getifa(info)))
 			senderr(error);
 		ifa = info->rti_ifa;
-		/* Already at splsoftnet() so pool_get/pool_put are safe */
 		rt = pool_get(&rtentry_pool, PR_NOWAIT);
 		if (rt == NULL)
 			senderr(ENOBUFS);
@@ -1196,7 +1195,6 @@ rt_timer_queue_remove_all(struct rttimer
 		if (destroy)
 			(*r->rtt_func)(r->rtt_rt, r);
 		rtfree(r->rtt_rt);
-		/* we are already at splsoftnet */
 		pool_put(&rttimer_pool, r);
 		if (rtq->rtq_count > 0)
 			rtq->rtq_count--;
@@ -1240,7 +1238,6 @@ rt_timer_remove_all(struct rtentry *rt, 
 		else
 			printf("rt_timer_remove_all: rtq_count reached 0\n");
 		rtfree(r->rtt_rt);
-		/* we are already at splsoftnet */
 		pool_put(&rttimer_pool, r);
 	}
 }
@@ -1251,7 +1248,6 @@ rt_timer_add(struct rtentry *rt,
 	struct rttimer_queue *queue)
 {
 	struct rttimer *r;
-	int s;
 
 	KASSERT(func != NULL);
 	/*
@@ -1271,9 +1267,7 @@ rt_timer_add(struct rtentry *rt,
 			printf("rt_timer_add: rtq_count reached 0\n");
 		rtfree(r->rtt_rt);
 	} else {
-		s = splsoftnet();
 		r = pool_get(&rttimer_pool, PR_NOWAIT);
-		splx(s);
 		if (r == NULL)
 			return ENOBUFS;
 	}