[PATCH] net: bridge: br_set_ageing_time takes a clock_t

[PATCH] net: bridge: br_set_ageing_time takes a clock_t

[Vivien Didelot]

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>
---
 net/bridge/br_private.h | 2 +-
 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 52edecf..b12447e 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -942,7 +942,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,
-- 
2.9.0

Re: [PATCH] net: bridge: br_set_ageing_time takes a clock_t

[Cong Wang]

On Thu, Jul 21, 2016 at 9:42 AM, Vivien Didelot
<vivien.didelot@savoirfairelinux.com> wrote:
> Change the ageing_time type in br_set_ageing_time() from u32 to what it
> is expected to be, i.e. a clock_t.

You also need to change struct switchdev_attr:

struct switchdev_attr {
        struct net_device *orig_dev;
        enum switchdev_attr_id id;
        u32 flags;
        void *complete_priv;
        void (*complete)(struct net_device *dev, int err, void *priv);
        union {
                struct netdev_phys_item_id ppid;        /* PORT_PARENT_ID */
                u8 stp_state;                           /* PORT_STP_STATE */
                unsigned long brport_flags;             /* PORT_BRIDGE_FLAGS */
                u32 ageing_time;                        /* BRIDGE_AGEING_TIME */
                bool vlan_filtering;                    /*
BRIDGE_VLAN_FILTERING */
        } u;
};

Re: [PATCH] net: bridge: br_set_ageing_time takes a clock_t

[Vivien Didelot]

Hi Cong,

Cong Wang <xiyou.wangcong@gmail.com> writes:

> On Thu, Jul 21, 2016 at 9:42 AM, Vivien Didelot
> <vivien.didelot@savoirfairelinux.com> wrote:
>> Change the ageing_time type in br_set_ageing_time() from u32 to what it
>> is expected to be, i.e. a clock_t.
>
> You also need to change struct switchdev_attr:
>
> struct switchdev_attr {
>         struct net_device *orig_dev;
>         enum switchdev_attr_id id;
>         u32 flags;
>         void *complete_priv;
>         void (*complete)(struct net_device *dev, int err, void *priv);
>         union {
>                 struct netdev_phys_item_id ppid;        /* PORT_PARENT_ID */
>                 u8 stp_state;                           /* PORT_STP_STATE */
>                 unsigned long brport_flags;             /* PORT_BRIDGE_FLAGS */
>                 u32 ageing_time;                        /* BRIDGE_AGEING_TIME */
>                 bool vlan_filtering;                    /*
> BRIDGE_VLAN_FILTERING */
>         } u;
> };

Already changed in net/master as of eabfdda93477
("net: switchdev: change ageing_time type to clock_t").

Thanks,

        Vivien

Re: [PATCH] net: bridge: br_set_ageing_time takes a clock_t

[Cong Wang]

On Thu, Jul 21, 2016 at 11:18 AM, Vivien Didelot
<vivien.didelot@savoirfairelinux.com> wrote:
> Hi Cong,
>
> Cong Wang <xiyou.wangcong@gmail.com> writes:
>
>> On Thu, Jul 21, 2016 at 9:42 AM, Vivien Didelot
>> <vivien.didelot@savoirfairelinux.com> wrote:
>>> Change the ageing_time type in br_set_ageing_time() from u32 to what it
>>> is expected to be, i.e. a clock_t.
>>
>> You also need to change struct switchdev_attr:
>>
>> struct switchdev_attr {
>>         struct net_device *orig_dev;
>>         enum switchdev_attr_id id;
>>         u32 flags;
>>         void *complete_priv;
>>         void (*complete)(struct net_device *dev, int err, void *priv);
>>         union {
>>                 struct netdev_phys_item_id ppid;        /* PORT_PARENT_ID */
>>                 u8 stp_state;                           /* PORT_STP_STATE */
>>                 unsigned long brport_flags;             /* PORT_BRIDGE_FLAGS */
>>                 u32 ageing_time;                        /* BRIDGE_AGEING_TIME */
>>                 bool vlan_filtering;                    /*
>> BRIDGE_VLAN_FILTERING */
>>         } u;
>> };
>
> Already changed in net/master as of eabfdda93477
> ("net: switchdev: change ageing_time type to clock_t").

Oh, your are right, sorry I was on net-next.

Re: [PATCH] net: bridge: br_set_ageing_time takes a clock_t

[David Miller]

From: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Date: Thu, 21 Jul 2016 12:42:19 -0400

> 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>

Applied.