From 4e4b0ad6ab81517fb4bd24ee74331b32111de5e4 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlov Date: Tue, 24 Dec 2013 10:19:28 +0400 Subject: Revert "ppp: don't unconditionaly load pppoe/pptp/l2tp modules, fixes false start warning if they're running already" This reverts commit c4ddc0fe1f402f84b1bb01b9568e2294569d0d15. --- accel-pppd/ctrl/pppoe/pppoe.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'accel-pppd/ctrl/pppoe') diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index 9d30c62..9a43181 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -1504,12 +1504,8 @@ static void pppoe_init(void) { struct conf_sect_t *s = conf_get_section("pppoe"); struct conf_option_t *opt; - int fd; - fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OE); - if (fd >= 0) - close(fd); - else if (system("modprobe -q pppoe")) + 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