summaryrefslogtreecommitdiff
path: root/accel-pppd/ctrl/pppoe
diff options
context:
space:
mode:
authorDmitry Kozlov <xeb@mail.ru>2013-12-24 10:19:28 +0400
committerDmitry Kozlov <xeb@mail.ru>2013-12-24 10:19:28 +0400
commit4e4b0ad6ab81517fb4bd24ee74331b32111de5e4 (patch)
tree4ea1bcecbc1871f6b5b703d2fce3744269038390 /accel-pppd/ctrl/pppoe
parentc4ddc0fe1f402f84b1bb01b9568e2294569d0d15 (diff)
downloadaccel-ppp-xebd-4e4b0ad6ab81517fb4bd24ee74331b32111de5e4.tar.gz
accel-ppp-xebd-4e4b0ad6ab81517fb4bd24ee74331b32111de5e4.zip
Revert "ppp: don't unconditionaly load pppoe/pptp/l2tp modules, fixes false start warning if they're running already"
This reverts commit c4ddc0fe1f402f84b1bb01b9568e2294569d0d15.
Diffstat (limited to 'accel-pppd/ctrl/pppoe')
-rw-r--r--accel-pppd/ctrl/pppoe/pppoe.c6
1 files changed, 1 insertions, 5 deletions
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));