From 01fcf87fe35502f6745137d79f56e618368872eb 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/pppoe/pppoe.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'accel-pppd/ctrl/pppoe') diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index 9a431818..9d30c62c 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -1504,8 +1504,12 @@ static void pppoe_init(void) { struct conf_sect_t *s = conf_get_section("pppoe"); struct conf_option_t *opt; + int fd; - if (system("modprobe -q pppoe")) + fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OE); + if (fd >= 0) + close(fd); + else if (system("modprobe -q pppoe")) log_warn("failed to load pppoe kernel module\n"); conn_pool = mempool_create(sizeof(struct pppoe_conn_t)); -- cgit v1.2.3