net: bridge: br_set_ageing_time takes a clock_t
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>
Thu, 21 Jul 2016 16:42:19 +0000 (12:42 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Jul 2016 17:30:03 +0000 (10:30 -0700)
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>
net/bridge/br_private.h
net/bridge/br_stp.c

index b3088264f844dfa26e3840f7251cd6c767dcd6ab..aac2a6e6b0086a3a54b4de8520ab30b2414d23cc 100644 (file)
@@ -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 */
index 9cb7044d0801605c629cadb5bb775b8c3725bcbc..9258b8ef14ff5f0b65af145b2fb9e517efa4eddd 100644 (file)
@@ -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,