diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2016-07-21 12:42:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-25 10:30:03 -0700 |
| commit | 9e0b27fe5ada7752577f3e1260eec44e79476142 (patch) | |
| tree | ff8f472f315e0778f782ae01daaafa4889d25964 | |
| parent | dba479f3d60a9d1f90458a4c6eb0754ecd22348c (diff) | |
| download | op-kernel-dev-9e0b27fe5ada7752577f3e1260eec44e79476142.zip op-kernel-dev-9e0b27fe5ada7752577f3e1260eec44e79476142.tar.gz | |
net: bridge: br_set_ageing_time takes a clock_t
Change the ageing_time type in br_set_ageing_time() from u32 to what it
is expected to be, i.e. a clock_t.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_private.h | 2 | ||||
| -rw-r--r-- | net/bridge/br_stp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index b308826..aac2a6e 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -975,7 +975,7 @@ void __br_set_forward_delay(struct net_bridge *br, unsigned long t); int br_set_forward_delay(struct net_bridge *br, unsigned long x); int br_set_hello_time(struct net_bridge *br, unsigned long x); int br_set_max_age(struct net_bridge *br, unsigned long x); -int br_set_ageing_time(struct net_bridge *br, u32 ageing_time); +int br_set_ageing_time(struct net_bridge *br, clock_t ageing_time); /* br_stp_if.c */ diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index 9cb7044..9258b8e 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -570,7 +570,7 @@ int br_set_max_age(struct net_bridge *br, unsigned long val) * * Offloaded switch entries maybe more restrictive */ -int br_set_ageing_time(struct net_bridge *br, u32 ageing_time) +int br_set_ageing_time(struct net_bridge *br, clock_t ageing_time) { struct switchdev_attr attr = { .orig_dev = br->dev, |
