Commit ef9cdd0f authored Dec 21, 2015 by Ido Schimmel Committed by David S. Miller Dec 22, 2015

switchdev: bridge: Pass ageing time as clock_t instead of jiffies



The bridge's ageing time is offloaded to hardware when:
	1) A port joins a bridge
	2) The ageing time of the bridge is changed

In the first case the ageing time is offloaded as jiffies, but in the
second case it's offloaded as clock_t, which is what existing switchdev
drivers expect to receive.

Fixes: 6ac311ae ("Adding switchdev ageing notification on port bridged")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5cbf20c7

net/bridge/br_stp_if.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ void br_init_port(struct net_bridge_port *p)
		struct switchdev_attr attr = {
		.id = SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,
		.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP \| SWITCHDEV_F_DEFER,
		.u.ageing_time = p->br->ageing_time,
		.u.ageing_time = jiffies_to_clock_t(p->br->ageing_time),
		};
		int err;