From c4ddc0fe1f402f84b1bb01b9568e2294569d0d15 Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko Date: Tue, 24 Dec 2013 11:45:48 +0600 Subject: ppp: don't unconditionaly load pppoe/pptp/l2tp modules, fixes false start warning if they're running already Signed-off-by: Vladislav Grishenko --- accel-pppd/ctrl/l2tp/l2tp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'accel-pppd/ctrl/l2tp') diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index 3b2e3f2..6b81022 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -3961,7 +3961,12 @@ static void load_config(void) static void l2tp_init(void) { - if (system("modprobe -q pppol2tp || modprobe -q l2tp_ppp")) + int fd; + + fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP); + if (fd >= 0) + close(fd); + else if (system("modprobe -q pppol2tp || modprobe -q l2tp_ppp")) log_warn("unable to load l2tp kernel module\n"); l2tp_conn = _malloc(L2TP_MAX_TID * sizeof(void *)); -- cgit v1.2.3