diff options
| author | xebd <xeb@mail.ru> | 2019-01-21 06:16:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 06:16:38 +0300 |
| commit | 7988855f92dc585ac854f683785fb2f7cd8d326e (patch) | |
| tree | 2fa849c6979544024818961beca221821cecb317 /accel-pppd/ctrl | |
| parent | 2910add2238d419ad82e43f3ebf1fb8d5708e13b (diff) | |
| parent | 56ff710d582cdd16dd9a5893ca0f027b3fd923eb (diff) | |
| download | accel-ppp-7988855f92dc585ac854f683785fb2f7cd8d326e.tar.gz accel-ppp-7988855f92dc585ac854f683785fb2f7cd8d326e.zip | |
Merge pull request #64 from themiron/warn-fixes
warning fixes
Diffstat (limited to 'accel-pppd/ctrl')
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe.c | 2 | ||||
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe_netlink.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index eb06e7b7..6155ccb3 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -1514,7 +1514,7 @@ static void ipoe_serv_disc_timer(struct triton_timer_t *t) { struct ipoe_serv *serv = container_of(t, typeof(*serv), disc_timer); struct timespec ts; - int delay, delay1 = INT_MAX, delay2 = INT_MAX, offer_delay; + int delay, delay1 = INT_MAX, delay2 = INT_MAX, offer_delay = 0; clock_gettime(CLOCK_MONOTONIC, &ts); diff --git a/accel-pppd/ctrl/ipoe/ipoe_netlink.c b/accel-pppd/ctrl/ipoe/ipoe_netlink.c index 4331e804..e42bf34c 100644 --- a/accel-pppd/ctrl/ipoe/ipoe_netlink.c +++ b/accel-pppd/ctrl/ipoe/ipoe_netlink.c @@ -626,7 +626,7 @@ static void init(void) { int mcg_id; - if (system("modprobe -q ipoe")) + if (access("/sys/module/ipoe", F_OK) && system("modprobe -q ipoe")) log_warn("failed to load ipoe module\n"); mcg_id = genl_resolve_mcg(IPOE_GENL_NAME, IPOE_GENL_MCG_PKT, &ipoe_genl_id); |