Module Name: src
Committed By: knakahara
Date: Wed Nov 15 07:52:58 UTC 2017
Modified Files:
src/sys/net: if_pppoe.c if_spppsubr.c
Log Message:
Mark callouts of pppoe(4) CALLOUT_MPSAFE. Suggested by ozaki-r@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/net/if_pppoe.c
cvs rdiff -u -r1.171 -r1.172 src/sys/net/if_spppsubr.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/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.129 src/sys/net/if_pppoe.c:1.130
--- src/sys/net/if_pppoe.c:1.129 Mon Oct 23 09:32:33 2017
+++ src/sys/net/if_pppoe.c Wed Nov 15 07:52:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.129 2017/10/23 09:32:33 msaitoh Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.130 2017/11/15 07:52:58 knakahara Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.129 2017/10/23 09:32:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.130 2017/11/15 07:52:58 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "pppoe.h"
@@ -317,7 +317,7 @@ pppoe_clone_create(struct if_clone *ifc,
/* changed to real address later */
memcpy(&sc->sc_dest, etherbroadcastaddr, sizeof(sc->sc_dest));
- callout_init(&sc->sc_timeout, 0);
+ callout_init(&sc->sc_timeout, CALLOUT_MPSAFE);
sc->sc_sppp.pp_if.if_start = pppoe_start;
#ifdef PPPOE_MPSAFE
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.171 src/sys/net/if_spppsubr.c:1.172
--- src/sys/net/if_spppsubr.c:1.171 Fri Oct 13 03:11:50 2017
+++ src/sys/net/if_spppsubr.c Wed Nov 15 07:52:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.171 2017/10/13 03:11:50 knakahara Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.172 2017/11/15 07:52:58 knakahara Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.171 2017/10/13 03:11:50 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.172 2017/11/15 07:52:58 knakahara Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -999,7 +999,7 @@ sppp_attach(struct ifnet *ifp)
/* Initialize keepalive handler. */
if (! spppq) {
- callout_init(&keepalive_ch, 0);
+ callout_init(&keepalive_ch, CALLOUT_MPSAFE);
callout_reset(&keepalive_ch, hz * LCP_KEEPALIVE_INTERVAL, sppp_keepalive, NULL);
}
@@ -2204,7 +2204,7 @@ sppp_lcp_init(struct sppp *sp)
sp->lcp.max_terminate = 2;
sp->lcp.max_configure = 10;
sp->lcp.max_failure = 10;
- callout_init(&sp->ch[IDX_LCP], 0);
+ callout_init(&sp->ch[IDX_LCP], CALLOUT_MPSAFE);
}
static void
@@ -2966,7 +2966,7 @@ sppp_ipcp_init(struct sppp *sp)
sp->fail_counter[IDX_IPCP] = 0;
sp->pp_seq[IDX_IPCP] = 0;
sp->pp_rseq[IDX_IPCP] = 0;
- callout_init(&sp->ch[IDX_IPCP], 0);
+ callout_init(&sp->ch[IDX_IPCP], CALLOUT_MPSAFE);
error = workqueue_create(&sp->ipcp.update_addrs_wq, "ipcp_update_addrs",
sppp_update_ip_addrs_work, sp, PRI_SOFTNET, IPL_NET, 0);
@@ -3525,7 +3525,7 @@ sppp_ipv6cp_init(struct sppp *sp)
sp->fail_counter[IDX_IPV6CP] = 0;
sp->pp_seq[IDX_IPV6CP] = 0;
sp->pp_rseq[IDX_IPV6CP] = 0;
- callout_init(&sp->ch[IDX_IPV6CP], 0);
+ callout_init(&sp->ch[IDX_IPV6CP], CALLOUT_MPSAFE);
}
static void
@@ -4463,7 +4463,7 @@ sppp_chap_init(struct sppp *sp)
sp->fail_counter[IDX_CHAP] = 0;
sp->pp_seq[IDX_CHAP] = 0;
sp->pp_rseq[IDX_CHAP] = 0;
- callout_init(&sp->ch[IDX_CHAP], 0);
+ callout_init(&sp->ch[IDX_CHAP], CALLOUT_MPSAFE);
}
static void
@@ -4831,8 +4831,8 @@ sppp_pap_init(struct sppp *sp)
sp->fail_counter[IDX_PAP] = 0;
sp->pp_seq[IDX_PAP] = 0;
sp->pp_rseq[IDX_PAP] = 0;
- callout_init(&sp->ch[IDX_PAP], 0);
- callout_init(&sp->pap_my_to_ch, 0);
+ callout_init(&sp->ch[IDX_PAP], CALLOUT_MPSAFE);
+ callout_init(&sp->pap_my_to_ch, CALLOUT_MPSAFE);
}
static void
