| From c37f094c79877bea56b929b74b4e5c8df05f2eda Mon Sep 17 00:00:00 2001 |
| From: Susant Sahani <145210+ssahani@users.noreply.github.com> |
| Date: Wed, 11 Oct 2017 12:38:05 +0530 |
| Subject: [PATCH] networkd: bridge allow AgeingTimeSec to be set 0 (#7021) |
| |
| Closes #7019. |
| |
| (cherry picked from commit 0da812036f6fd60a7b5477fafb2eead9e98f4c78) |
| |
| src/network/netdev/bridge.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c |
| index 16fff78bf8..17c3955ef5 100644 |
| |
| |
| @@ -91,7 +91,7 @@ static int netdev_bridge_post_create(NetDev *netdev, Link *link, sd_netlink_mess |
| return log_netdev_error_errno(netdev, r, "Could not append IFLA_BR_MAX_AGE attribute: %m"); |
| } |
| |
| - if (b->ageing_time > 0) { |
| + if (b->ageing_time != USEC_INFINITY) { |
| r = sd_netlink_message_append_u32(req, IFLA_BR_AGEING_TIME, usec_to_jiffies(b->ageing_time)); |
| if (r < 0) |
| return log_netdev_error_errno(netdev, r, "Could not append IFLA_BR_AGEING_TIME attribute: %m"); |
| @@ -169,6 +169,7 @@ static void bridge_init(NetDev *n) { |
| b->stp = -1; |
| b->default_pvid = VLANID_INVALID; |
| b->forward_delay = USEC_INFINITY; |
| + b->ageing_time = USEC_INFINITY; |
| } |
| |
| const NetDevVTable bridge_vtable = { |