]> git.neil.brown.name Git - md.git/commitdiff
switchdev: bridge: Pass ageing time as clock_t instead of jiffies
authorIdo Schimmel <idosch@mellanox.com>
Mon, 21 Dec 2015 08:56:01 +0000 (09:56 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Dec 2015 20:56:44 +0000 (15:56 -0500)
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: 6ac311ae8bfb ("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>
net/bridge/br_stp_if.c

index 5396ff08af3215d1a532b853c8859fb64dfc6a1f..12045dea276c2ddae68f0d17ad0444eba02b8d02 100644 (file)
@@ -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;