lkml.org 
[lkml]   [2018]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 065/168] net/ibm/emac: wrong emac_calc_base call was used by typo
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ivan Mikhaylov <ivan@de.ibm.com>

    [ Upstream commit bf68066fccb10fce6bbffdda24ee2ae314c9c5b2 ]

    __emac_calc_base_mr1 was used instead of __emac4_calc_base_mr1
    by copy-paste mistake for emac4syn.

    Fixes: 45d6e545505fd32edb812f085be7de45b6a5c0af ("net/ibm/emac: add 8192 rx/tx fifo size")
    Signed-off-by: Ivan Mikhaylov <ivan@de.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/ibm/emac/core.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/net/ethernet/ibm/emac/core.c
    +++ b/drivers/net/ethernet/ibm/emac/core.c
    @@ -494,9 +494,6 @@ static u32 __emac_calc_base_mr1(struct e
    case 16384:
    ret |= EMAC_MR1_RFS_16K;
    break;
    - case 8192:
    - ret |= EMAC4_MR1_RFS_8K;
    - break;
    case 4096:
    ret |= EMAC_MR1_RFS_4K;
    break;
    @@ -537,6 +534,9 @@ static u32 __emac4_calc_base_mr1(struct
    case 16384:
    ret |= EMAC4_MR1_RFS_16K;
    break;
    + case 8192:
    + ret |= EMAC4_MR1_RFS_8K;
    + break;
    case 4096:
    ret |= EMAC4_MR1_RFS_4K;
    break;

    \
     
     \ /
      Last update: 2018-10-08 20:59    [W:2.420 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site