Module Name: src
Committed By: yamaguchi
Date: Fri Apr 16 01:32:04 UTC 2021
Modified Files:
src/sys/net: if_pppoe.c
Log Message:
Use kmem_zalloc to allocate pppoe_softc
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/net/if_pppoe.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.164 src/sys/net/if_pppoe.c:1.165
--- src/sys/net/if_pppoe.c:1.164 Fri Apr 16 01:28:51 2021
+++ src/sys/net/if_pppoe.c Fri Apr 16 01:32:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.164 2021/04/16 01:28:51 yamaguchi Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.165 2021/04/16 01:32:04 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.164 2021/04/16 01:28:51 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.165 2021/04/16 01:32:04 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "pppoe.h"
@@ -341,7 +341,7 @@ pppoe_clone_create(struct if_clone *ifc,
struct pppoe_softc *sc;
int rv;
- sc = malloc(sizeof(struct pppoe_softc), M_DEVBUF, M_WAITOK|M_ZERO);
+ sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
rw_init(&sc->sc_lock);
pppoe_softc_genid(&sc->sc_id);
@@ -408,7 +408,7 @@ destroy_timeout:
workqueue_destroy(sc->sc_timeout_wq);
destroy_sclock:
rw_destroy(&sc->sc_lock);
- free(sc, M_DEVBUF);
+ kmem_free(sc, sizeof(*sc));
return rv;
}
@@ -449,7 +449,7 @@ pppoe_clone_destroy(struct ifnet *ifp)
PPPOE_UNLOCK(sc);
rw_destroy(&sc->sc_lock);
- free(sc, M_DEVBUF);
+ kmem_free(sc, sizeof(*sc));
return 0;
}
