netdev - Re: [PATCH] HHF qdisc: fix jiffies-time conversion.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAB_+Fg7HNc3r8D31WB=U7ZuRuGZdoNbZfsh6Sds-Xq4cRVLY_Q@mail.gmail.com>
Date:	Fri, 10 Jan 2014 11:02:45 -0800
From:	Nandita Dukkipati <nanditad@...gle.com>
To:	Terry Lam <vtlam@...gle.com>
Cc:	"David S. Miller" <davem@...emloft.net>,
	Netdev <netdev@...r.kernel.org>,
	Stephen Hemminger <stephen@...workplumber.org>
Subject: Re: [PATCH] HHF qdisc: fix jiffies-time conversion.

On Thu, Jan 9, 2014 at 12:40 AM, Terry Lam <vtlam@...gle.com> wrote:
> This is to be compatible with the use of "get_time" (i.e. default
> time unit in us) in iproute2 patch for HHF as requested by Stephen.
>
> Signed-off-by: Terry Lam <vtlam@...gle.com>
> ---
>  net/sched/sch_hhf.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c
> index cf7f614..1cf84a9 100644
> --- a/net/sched/sch_hhf.c
> +++ b/net/sched/sch_hhf.c
> @@ -574,18 +574,18 @@ static int hhf_change(struct Qdisc *sch, struct nlattr *opt)
>                 q->hh_flows_limit = nla_get_u32(tb[TCA_HHF_HH_FLOWS_LIMIT]);
>
>         if (tb[TCA_HHF_RESET_TIMEOUT]) {
> -               u32 ms = nla_get_u32(tb[TCA_HHF_RESET_TIMEOUT]);
> +               u32 us = nla_get_u32(tb[TCA_HHF_RESET_TIMEOUT]);
>
> -               q->hhf_reset_timeout = msecs_to_jiffies(ms);
> +               q->hhf_reset_timeout = usecs_to_jiffies(us);
>         }
>
>         if (tb[TCA_HHF_ADMIT_BYTES])
>                 q->hhf_admit_bytes = nla_get_u32(tb[TCA_HHF_ADMIT_BYTES]);
>
>         if (tb[TCA_HHF_EVICT_TIMEOUT]) {
> -               u32 ms = nla_get_u32(tb[TCA_HHF_EVICT_TIMEOUT]);
> +               u32 us = nla_get_u32(tb[TCA_HHF_EVICT_TIMEOUT]);
>
> -               q->hhf_evict_timeout = msecs_to_jiffies(ms);
> +               q->hhf_evict_timeout = usecs_to_jiffies(us);
>         }
>
>         qlen = sch->q.qlen;
> @@ -684,10 +684,10 @@ static int hhf_dump(struct Qdisc *sch, struct sk_buff *skb)
>             nla_put_u32(skb, TCA_HHF_QUANTUM, q->quantum) ||
>             nla_put_u32(skb, TCA_HHF_HH_FLOWS_LIMIT, q->hh_flows_limit) ||
>             nla_put_u32(skb, TCA_HHF_RESET_TIMEOUT,
> -                       jiffies_to_msecs(q->hhf_reset_timeout)) ||
> +                       jiffies_to_usecs(q->hhf_reset_timeout)) ||
>             nla_put_u32(skb, TCA_HHF_ADMIT_BYTES, q->hhf_admit_bytes) ||
>             nla_put_u32(skb, TCA_HHF_EVICT_TIMEOUT,
> -                       jiffies_to_msecs(q->hhf_evict_timeout)) ||
> +                       jiffies_to_usecs(q->hhf_evict_timeout)) ||
>             nla_put_u32(skb, TCA_HHF_NON_HH_WEIGHT, q->hhf_non_hh_weight))
>                 goto nla_put_failure;
>
> --
> 1.8.5.1
>
Acked-by: Nandita Dukkipati <nanditad@...gle.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html