diff -Naurp keepalived-1.1.X-aloha-flx1.1/keepalived/vrrp/vrrp_if.c keepalived-1.1.X-aloha-flx1.1-patch/keepalived/vrrp/vrrp_if.c --- keepalived-1.1.X-aloha-flx1.1/keepalived/vrrp/vrrp_if.c 2011-02-01 16:31:52.000000000 +0100 +++ keepalived-1.1.X-aloha-flx1.1-patch/keepalived/vrrp/vrrp_if.c 2011-02-01 16:40:15.000000000 +0100 @@ -291,10 +291,10 @@ dump_if(void *if_data_obj) } /* MII channel supported ? */ - if (IF_MII_SUPPORTED(ifp)) - log_message(LOG_INFO, " NIC support MII regs"); - else if (IF_ETHTOOL_SUPPORTED(ifp)) + if (IF_ETHTOOL_SUPPORTED(ifp)) log_message(LOG_INFO, " NIC support EHTTOOL GLINK interface"); + else if (IF_MII_SUPPORTED(ifp)) + log_message(LOG_INFO, " NIC support MII regs"); else log_message(LOG_INFO, " Enabling NIC ioctl refresh polling"); } @@ -316,10 +316,10 @@ if_linkbeat_refresh_thread(thread * thre { interface *ifp = THREAD_ARG(thread_obj); - if (IF_MII_SUPPORTED(ifp)) - ifp->linkbeat = (if_mii_probe(ifp->ifname, 0)) ? 1 : 0; - else if (IF_ETHTOOL_SUPPORTED(ifp)) + if (IF_ETHTOOL_SUPPORTED(ifp)) ifp->linkbeat = (if_ethtool_probe(ifp->ifname)) ? 1 : 0; + else if (IF_MII_SUPPORTED(ifp)) + ifp->linkbeat = (if_mii_probe(ifp->ifname, 0)) ? 1 : 0; else ifp->linkbeat = 1; @@ -344,14 +344,14 @@ init_if_linkbeat(void) for (e = LIST_HEAD(if_queue); e; ELEMENT_NEXT(e)) { ifp = ELEMENT_DATA(e); ifp->lb_type = LB_IOCTL; - status = if_mii_probe(ifp->ifname, 1); + status = if_ethtool_probe(ifp->ifname); if (status >= 0) { - ifp->lb_type = LB_MII; + ifp->lb_type = LB_ETHTOOL; ifp->linkbeat = (status) ? 1 : 0; } else { - status = if_ethtool_probe(ifp->ifname); + status = if_mii_probe(ifp->ifname, 1); if (status >= 0) { - ifp->lb_type = LB_ETHTOOL; + ifp->lb_type = LB_MII; ifp->linkbeat = (status) ? 1 : 0; } } @@ -367,7 +367,7 @@ if_linkbeat(const interface * ifp) if (!data->linkbeat_use_polling) return 1; - if (IF_MII_SUPPORTED(ifp) || IF_ETHTOOL_SUPPORTED(ifp)) + if (IF_ETHTOOL_SUPPORTED(ifp) || IF_MII_SUPPORTED(ifp)) return IF_LINKBEAT(ifp); return 1;