diff options
| author | Ido Schimmel <idosch@mellanox.com> | 2015-12-21 09:56:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-22 15:56:44 -0500 |
| commit | ef9cdd0fed3875b1ae9cc85987d8143354b2d4c8 (patch) | |
| tree | c7ab7ebde9c6522dd0d1e6bb22b211a7ebba8a76 /net/bridge/br_stp_if.c | |
| parent | 5cbf20c747987346f8352b156e3f05d3b84ac4ac (diff) | |
| download | linux-ef9cdd0fed3875b1ae9cc85987d8143354b2d4c8.tar.bz2 | |
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: 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>
Diffstat (limited to 'net/bridge/br_stp_if.c')
| -rw-r--r-- | net/bridge/br_stp_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 5396ff08af32..12045dea276c 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -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; |