[patch net] switchdev: bridge: Pass ageing time as clock_t instead of jiffies

[patch net] switchdev: bridge: Pass ageing time as clock_t instead of jiffies

[Jiri Pirko]

From: Ido Schimmel <idosch@mellanox.com>

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>
---
 net/bridge/br_stp_if.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 5396ff08..12045de 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;
 
-- 
2.4.3

Re: [patch net] switchdev: bridge: Pass ageing time as clock_t instead of jiffies

[David Ahern]

On 12/21/15 3:56 AM, Jiri Pirko wrote:
> diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
> index 5396ff08..12045de 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;


ageing_time is a u32; clock_t is a long.

Re: [patch net] switchdev: bridge: Pass ageing time as clock_t instead of jiffies

[Ido Schimmel]

Mon, Dec 21, 2015 at 05:53:19PM IST, dsahern@gmail.com wrote:
>On 12/21/15 3:56 AM, Jiri Pirko wrote:
>> diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
>> index 5396ff08..12045de 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;
>
>
>ageing_time is a u32; clock_t is a long.

Hi,

p->br->ageing_time is set in br_set_ageing_time, where it's converted to
jiffies from clock_t, that is treated as u32.

Re: [patch net] switchdev: bridge: Pass ageing time as clock_t instead of jiffies

[David Miller]

From: Jiri Pirko <jiri@resnulli.us>
Date: Mon, 21 Dec 2015 09:56:01 +0100

> From: Ido Schimmel <idosch@mellanox.com>
> 
> 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>

Applied and queued up for -stable, thanks!