From: Vincent Bernat Date: Sat, 30 Jan 2016 11:59:04 +0000 (+0100) Subject: interfaces/linux: don't check transmit queue size X-Git-Tag: 0.9.1~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e78f3a69b9328f21483ba6751c92eda6e73b781;p=thirdparty%2Flldpd.git interfaces/linux: don't check transmit queue size Its size can change while no netlink messages will be sent to update it. --- diff --git a/src/daemon/interfaces-linux.c b/src/daemon/interfaces-linux.c index 9803d30f..06694f4a 100644 --- a/src/daemon/interfaces-linux.c +++ b/src/daemon/interfaces-linux.c @@ -748,14 +748,6 @@ iflinux_add_physical(struct lldpd *cfg, continue; } - /* Check queue len. If no queue, this usually means that this - is not a "real" interface. */ - if (iface->txqueue == 0) { - log_debug("interfaces", "skip %s: no queue", - iface->name); - continue; - } - /* Get the real MAC address (for example, if the interface is enslaved) */ iflinux_get_permanent_mac(cfg, interfaces, iface); diff --git a/src/daemon/lldpd.h b/src/daemon/lldpd.h index fd0d09e4..aacb39e4 100644 --- a/src/daemon/lldpd.h +++ b/src/daemon/lldpd.h @@ -321,7 +321,6 @@ struct interfaces_device { #ifdef HOST_OS_LINUX int lower_idx; /* Index to lower interface */ int upper_idx; /* Index to upper interface */ - int txqueue; /* Transmit queue length */ #endif }; struct interfaces_address { diff --git a/src/daemon/netlink.c b/src/daemon/netlink.c index e0c2b888..d495f10f 100644 --- a/src/daemon/netlink.c +++ b/src/daemon/netlink.c @@ -234,10 +234,6 @@ netlink_parse_link(struct nlmsghdr *msg, /* Index of master interface */ iff->upper_idx = *(int*)RTA_DATA(attribute); break; - case IFLA_TXQLEN: - /* Transmit queue length */ - iff->txqueue = *(int*)RTA_DATA(attribute); - break; case IFLA_MTU: /* Maximum Transmission Unit */ iff->mtu = *(int*)RTA_DATA(attribute);