preliminary work for ifplugd 0.25

git-svn-id: file:///home/lennart/svn/public/ifplugd/trunk@110 2bf48fe7-cfc1-0310-909f-d9042e1e0fef

1 files changed, 3 insertions, 9 deletions

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;
     }