lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 333/343] net: neigh: use long type to store jiffies delta
    Date
    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit 9d027e3a83f39b819e908e4e09084277a2e45e95 ]

    A difference of two unsigned long needs long storage.

    Fixes: c7fb64db001f ("[NETLINK]: Neighbour table configuration and statistics via rtnetlink")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/core/neighbour.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/net/core/neighbour.c b/net/core/neighbour.c
    index 16ac50b1b9a71..567e431813e59 100644
    --- a/net/core/neighbour.c
    +++ b/net/core/neighbour.c
    @@ -1877,8 +1877,8 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl,
    goto nla_put_failure;
    {
    unsigned long now = jiffies;
    - unsigned int flush_delta = now - tbl->last_flush;
    - unsigned int rand_delta = now - tbl->last_rand;
    + long flush_delta = now - tbl->last_flush;
    + long rand_delta = now - tbl->last_rand;
    struct neigh_hash_table *nht;
    struct ndt_config ndc = {
    .ndtc_key_len = tbl->key_len,
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 11:08    [W:4.172 / U:0.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site