From 65c009df1c2b3432cb3686a6a3941965fabcbbfd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 10 May 2004 21:32:00 +0000 Subject: preliminary work for ifplugd 0.25 git-svn-id: file:///home/lennart/svn/public/ifplugd/trunk@110 2bf48fe7-cfc1-0310-909f-d9042e1e0fef --- src/ifplugd.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/ifplugd.c') diff --git a/src/ifplugd.c b/src/ifplugd.c index d9aa708..624d991 100644 --- a/src/ifplugd.c +++ b/src/ifplugd.c @@ -254,12 +254,6 @@ interface_status_t detect_beat_auto(int fd, char *iface) { if (cached_detect_beat_func && (status = cached_detect_beat_func(fd, iface)) != IFSTATUS_ERR) return status; - if ((status = interface_detect_beat_iff(fd, iface)) != IFSTATUS_ERR) { - cached_detect_beat_func = interface_detect_beat_iff; - daemon_log(LOG_INFO, "Using detection mode: IFF_RUNNING"); - return status; - } - if ((status = interface_detect_beat_ethtool(fd, iface)) != IFSTATUS_ERR) { cached_detect_beat_func = interface_detect_beat_ethtool; daemon_log(LOG_INFO, "Using detection mode: SIOCETHTOOL"); @@ -278,9 +272,9 @@ interface_status_t detect_beat_auto(int fd, char *iface) { return status; } - if ((status = interface_detect_beat_priv(fd, iface)) != IFSTATUS_ERR) { - cached_detect_beat_func = interface_detect_beat_priv; - daemon_log(LOG_INFO, "Using detection mode: SIOCDEVPRIVATE"); + if ((status = interface_detect_beat_iff(fd, iface)) != IFSTATUS_ERR) { + cached_detect_beat_func = interface_detect_beat_iff; + daemon_log(LOG_INFO, "Using detection mode: IFF_RUNNING"); return status; } -- cgit