lkml.org 
[lkml]   [2020]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 44/89] net: fec: validate the new settings in fec_enet_set_coalesce()
    Date
    From: Jakub Kicinski <kuba@kernel.org>

    [ Upstream commit ab14961d10d02d20767612c78ce148f6eb85bd58 ]

    fec_enet_set_coalesce() validates the previously set params
    and if they are within range proceeds to apply the new ones.
    The new ones, however, are not validated. This seems backwards,
    probably a copy-paste error?

    Compile tested only.

    Fixes: d851b47b22fc ("net: fec: add interrupt coalescence feature support")
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Acked-by: Fugang Duan <fugang.duan@nxp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/freescale/fec_main.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/net/ethernet/freescale/fec_main.c
    +++ b/drivers/net/ethernet/freescale/fec_main.c
    @@ -2476,15 +2476,15 @@ fec_enet_set_coalesce(struct net_device
    return -EINVAL;
    }

    - cycle = fec_enet_us_to_itr_clock(ndev, fep->rx_time_itr);
    + cycle = fec_enet_us_to_itr_clock(ndev, ec->rx_coalesce_usecs);
    if (cycle > 0xFFFF) {
    pr_err("Rx coalesced usec exceed hardware limitation\n");
    return -EINVAL;
    }

    - cycle = fec_enet_us_to_itr_clock(ndev, fep->tx_time_itr);
    + cycle = fec_enet_us_to_itr_clock(ndev, ec->tx_coalesce_usecs);
    if (cycle > 0xFFFF) {
    - pr_err("Rx coalesced usec exceed hardware limitation\n");
    + pr_err("Tx coalesced usec exceed hardware limitation\n");
    return -EINVAL;
    }


    \
     
     \ /
      Last update: 2020-03-17 11:58    [W:2.272 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site