diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2016-04-04 16:53:12 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2016-04-04 16:53:12 +0300 |
| commit | 38277ffc234acaae8fa0d2832cc7ce5b05c32395 (patch) | |
| tree | 2815af038d783e1a5edeaec34d80bfac66dfb521 /accel-pppd/ctrl | |
| parent | f67292499b20f599f2bd744d2dcf0f6779581787 (diff) | |
| download | accel-ppp-38277ffc234acaae8fa0d2832cc7ce5b05c32395.tar.gz accel-ppp-38277ffc234acaae8fa0d2832cc7ce5b05c32395.zip | |
vlan_mon: make possible to work other module after message "vlan not started"
Diffstat (limited to 'accel-pppd/ctrl')
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe.c | 3 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/pppoe.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index bb1f962..3edf7f0 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -1913,8 +1913,6 @@ void ipoe_recv_up(int ifindex, struct ethhdr *eth, struct iphdr *iph, struct _ar struct ipoe_session *ses; in_addr_t saddr = arph ? arph->ar_spa : iph->saddr; - log_debug("ipoe: recv up %08x\n", saddr); - pthread_mutex_lock(&serv_lock); list_for_each_entry(serv, &serv_list, entry) { if (serv->ifindex != ifindex) @@ -2423,6 +2421,7 @@ void ipoe_vlan_mon_notify(int ifindex, int vid, int vlan_ifindex) log_warn("ipoe: vlan %s not started\n", ifname); iplink_vlan_del(ifr.ifr_ifindex); + vlan_mon_del_vid(ifindex, ETH_P_IP, vid); } static void ipoe_serv_timeout(struct triton_timer_t *t) diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index 70978cf..4e4b381 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -1721,6 +1721,7 @@ void pppoe_vlan_mon_notify(int ifindex, int vid, int vlan_ifindex) log_warn("pppoe: vlan %s not started\n", ifname); iplink_vlan_del(ifr.ifr_ifindex); + vlan_mon_del_vid(ifindex, ETH_P_PPP_DISC, vid); } static void add_vlan_mon(const char *opt, long *mask) |