From 56ff710d582cdd16dd9a5893ca0f027b3fd923eb Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko Date: Sat, 19 Jan 2019 03:28:39 +0500 Subject: ipoe/vlan_mon: add check for already loaded module --- accel-pppd/ctrl/ipoe/ipoe_netlink.c | 2 +- accel-pppd/vlan-mon/vlan_mon.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/accel-pppd/ctrl/ipoe/ipoe_netlink.c b/accel-pppd/ctrl/ipoe/ipoe_netlink.c index 4331e80..e42bf34 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); diff --git a/accel-pppd/vlan-mon/vlan_mon.c b/accel-pppd/vlan-mon/vlan_mon.c index 2892f4f..f2109ed 100644 --- a/accel-pppd/vlan-mon/vlan_mon.c +++ b/accel-pppd/vlan-mon/vlan_mon.c @@ -522,7 +522,7 @@ static void init(void) { int mcg_id; - if (system("modprobe -q vlan_mon")) + if (access("/sys/module/vlan_mon", F_OK) && system("modprobe -q vlan_mon")) log_warn("failed to load vlan_mon module\n"); mcg_id = genl_resolve_mcg(VLAN_MON_GENL_NAME, VLAN_MON_GENL_MCG, &vlan_mon_genl_id); -- cgit v1.2.3