diff options
| author | xebd <xeb@mail.ru> | 2019-01-28 13:08:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28 13:08:33 +0300 |
| commit | 1e2fa0927607a94b7e02d0ca3fd18eb090822de9 (patch) | |
| tree | edc7275a9f4a4aebd67479bc2619c9f22a862491 | |
| parent | 6538ee3289b39c2c978a9a7c6d82a4e9f7dbfd7f (diff) | |
| parent | 0fad26e294b897fa398c30378d63225fa98d5c5b (diff) | |
| download | accel-ppp-1e2fa0927607a94b7e02d0ca3fd18eb090822de9.tar.gz accel-ppp-1e2fa0927607a94b7e02d0ca3fd18eb090822de9.zip | |
Merge pull request #68 from DmitriyEshenko/master
ipoe: fix start=up not work if set not per-interface and proxy-arp=0
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index 6fd850d..b8082a6 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -2910,15 +2910,15 @@ static void add_interface(const char *ifname, int ifindex, const char *opt, int } } - if (!opt_arp && opt_up && opt_mode == MODE_L2) - opt_arp = 1; - if (!opt_up && !opt_dhcpv4 && !opt_auto) { opt_up = conf_up; opt_dhcpv4 = conf_dhcpv4; opt_auto = conf_auto; } + if (!opt_arp && opt_up && opt_mode == MODE_L2) + opt_arp = 1; + opt_auto &= !opt_shared; if (opt_relay && !opt_giaddr && opt_dhcpv4) { |