diff options
| author | andre <andre@FreeBSD.org> | 2012-10-18 13:57:24 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2012-10-18 13:57:24 +0000 |
| commit | 34a9a386cb4df8844bca8e43dae20e4a15710fcc (patch) | |
| tree | 822857ae1f88eb65d6756450fb5600f0644b00d1 /sys/netinet6/nd6.c | |
| parent | bec3d0dcde51da4b3b1a5bc9fbea92a5353a57ed (diff) | |
| download | FreeBSD-src-34a9a386cb4df8844bca8e43dae20e4a15710fcc.zip FreeBSD-src-34a9a386cb4df8844bca8e43dae20e4a15710fcc.tar.gz | |
Mechanically remove the last stray remains of spl* calls from net*/*.
They have been Noop's for a long time now.
Diffstat (limited to 'sys/netinet6/nd6.c')
| -rw-r--r-- | sys/netinet6/nd6.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 592eb90..1e2b43f 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -575,7 +575,6 @@ void nd6_timer(void *arg) { CURVNET_SET((struct vnet *) arg); - int s; struct nd_defrouter *dr, *ndr; struct nd_prefix *pr, *npr; struct in6_ifaddr *ia6, *nia6; @@ -584,7 +583,6 @@ nd6_timer(void *arg) nd6_timer, curvnet); /* expire default router list */ - s = splnet(); TAILQ_FOREACH_SAFE(dr, &V_nd_defrouter, dr_entry, ndr) { if (dr->expire && dr->expire < time_second) defrtrlist_del(dr); @@ -679,7 +677,6 @@ nd6_timer(void *arg) prelist_remove(pr); } } - splx(s); CURVNET_RESTORE(); } @@ -1216,7 +1213,6 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) struct nd_defrouter *dr; struct nd_prefix *pr; int i = 0, error = 0; - int s; switch (cmd) { case SIOCGDRLST_IN6: @@ -1224,7 +1220,6 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) * obsolete API, use sysctl under net.inet6.icmp6 */ bzero(drl, sizeof(*drl)); - s = splnet(); TAILQ_FOREACH(dr, &V_nd_defrouter, dr_entry) { if (i >= DRLSTSIZ) break; @@ -1237,7 +1232,6 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) drl->defrouter[i].if_index = dr->ifp->if_index; i++; } - splx(s); break; case SIOCGPRLST_IN6: /* @@ -1253,7 +1247,6 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) * how about separating ioctls into two? */ bzero(oprl, sizeof(*oprl)); - s = splnet(); LIST_FOREACH(pr, &V_nd_prefix, ndpr_entry) { struct nd_pfxrouter *pfr; int j; @@ -1299,7 +1292,6 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) i++; } - splx(s); break; case OSIOCGIFINFO_IN6: @@ -1448,7 +1440,6 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) /* flush all the prefix advertised by routers */ struct nd_prefix *pr, *next; - s = splnet(); LIST_FOREACH_SAFE(pr, &V_nd_prefix, ndpr_entry, next) { struct in6_ifaddr *ia, *ia_next; @@ -1467,7 +1458,6 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) } prelist_remove(pr); } - splx(s); break; } case SIOCSRTRFLUSH_IN6: @@ -1475,13 +1465,11 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) /* flush all the default routers */ struct nd_defrouter *dr, *next; - s = splnet(); defrouter_reset(); TAILQ_FOREACH_SAFE(dr, &V_nd_defrouter, dr_entry, next) { defrtrlist_del(dr); } defrouter_select(); - splx(s); break; } case SIOCGNBRINFO_IN6: |
