[src/trunk]: src/sys/net Use callout_setfunc and callout_schedule

[yamaguchi <yamaguchi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/721f33e95459
branches:  trunk
changeset: 955087:721f33e95459
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Fri Sep 18 09:48:56 2020 +0000

description:
Use callout_setfunc and callout_schedule

diffstat:

 sys/net/if_pppoe.c |  29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diffs (99 lines):

diff -r cd72f42d2443 -r 721f33e95459 sys/net/if_pppoe.c
--- a/sys/net/if_pppoe.c        Fri Sep 18 07:21:26 2020 +0000
+++ b/sys/net/if_pppoe.c        Fri Sep 18 09:48:56 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.149 2020/02/10 22:38:10 mlelstv Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.150 2020/09/18 09:48:56 yamaguchi 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.149 2020/02/10 22:38:10 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.150 2020/09/18 09:48:56 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pppoe.h"
@@ -350,6 +350,7 @@
        memcpy(&sc->sc_dest, etherbroadcastaddr, sizeof(sc->sc_dest));
 
        callout_init(&sc->sc_timeout, CALLOUT_MPSAFE);
+       callout_setfunc(&sc->sc_timeout, pppoe_timeout, sc);
 
        sc->sc_sppp.pp_if.if_start = pppoe_start;
 #ifdef PPPOE_MPSAFE
@@ -913,9 +914,8 @@
                                    "error=%d\n", sc->sc_sppp.pp_if.if_xname,
                                    err);
                }
-               callout_reset(&sc->sc_timeout,
-                   PPPOE_DISC_TIMEOUT * (1 + sc->sc_padr_retried),
-                   pppoe_timeout, sc);
+               callout_schedule(&sc->sc_timeout,
+                   PPPOE_DISC_TIMEOUT * (1 + sc->sc_padr_retried));
 
                PPPOE_UNLOCK(sc);
                break;
@@ -1461,8 +1461,7 @@
                                    "error=%d\n",
                                    sc->sc_sppp.pp_if.if_xname, err);
                }
-               callout_reset(&sc->sc_timeout, retry_wait,
-                   pppoe_timeout, sc);
+               callout_schedule(&sc->sc_timeout,retry_wait);
                RELEASE_SPLNET();
                break;
 
@@ -1480,9 +1479,8 @@
                                            ", error=%d\n",
                                            sc->sc_sppp.pp_if.if_xname, err);
                        }
-                       callout_reset(&sc->sc_timeout,
-                           PPPOE_DISC_TIMEOUT * (1 + sc->sc_padi_retried),
-                           pppoe_timeout, sc);
+                       callout_schedule(&sc->sc_timeout,
+                           PPPOE_DISC_TIMEOUT * (1 + sc->sc_padi_retried));
                        RELEASE_SPLNET();
                        PPPOE_UNLOCK(sc);
                        return;
@@ -1494,9 +1492,8 @@
                                    "error=%d\n", sc->sc_sppp.pp_if.if_xname,
                                    err);
                }
-               callout_reset(&sc->sc_timeout,
-                   PPPOE_DISC_TIMEOUT * (1 + sc->sc_padr_retried),
-                   pppoe_timeout, sc);
+               callout_schedule(&sc->sc_timeout,
+                   PPPOE_DISC_TIMEOUT * (1 + sc->sc_padr_retried));
                RELEASE_SPLNET();
                break;
        case PPPOE_STATE_CLOSING:
@@ -1534,7 +1531,7 @@
        if (err != 0 && sc->sc_sppp.pp_if.if_flags & IFF_DEBUG)
                printf("%s: failed to send PADI, error=%d\n",
                    sc->sc_sppp.pp_if.if_xname, err);
-       callout_reset(&sc->sc_timeout, PPPOE_DISC_TIMEOUT, pppoe_timeout, sc);
+       callout_schedule(&sc->sc_timeout, PPPOE_DISC_TIMEOUT);
        RELEASE_SPLNET();
        return err;
 }
@@ -1820,7 +1817,7 @@
        } else {
                wtime = PPPOE_RECON_IMMEDIATE;
        }
-       callout_reset(&sc->sc_timeout, wtime, pppoe_timeout, sc);
+       callout_schedule(&sc->sc_timeout, wtime);
 
        PPPOE_UNLOCK(sc);
 }
@@ -1843,7 +1840,7 @@
         */
        sc->sc_state = PPPOE_STATE_CLOSING;
 
-       callout_reset(&sc->sc_timeout, hz/50, pppoe_timeout, sc);
+       callout_schedule(&sc->sc_timeout, hz/50);
 
        PPPOE_UNLOCK(sc);
 }