diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2013-12-24 10:19:28 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2013-12-24 10:19:28 +0400 |
| commit | 4e4b0ad6ab81517fb4bd24ee74331b32111de5e4 (patch) | |
| tree | 4ea1bcecbc1871f6b5b703d2fce3744269038390 /accel-pppd/ctrl/l2tp/l2tp.c | |
| parent | c4ddc0fe1f402f84b1bb01b9568e2294569d0d15 (diff) | |
| download | accel-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/l2tp/l2tp.c')
| -rw-r--r-- | accel-pppd/ctrl/l2tp/l2tp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index 6b81022..3b2e3f2 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -3961,12 +3961,7 @@ static void load_config(void) static void l2tp_init(void) { - 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")) + 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 *)); |