summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorIvan Mikhaylov <ivan@de.ibm.com>2018-09-03 10:26:28 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-10 08:55:56 +0200
commit5bdcac88df0bbe80c636dce61cb211641a4e879c (patch)
tree3d6d02d9b0c5118deaf289657227faab98224d9e /drivers/net/ethernet
parenta06e07ce6f61fb3280615965fdc1652779df248d (diff)
downloadlinux-stable-5bdcac88df0bbe80c636dce61cb211641a4e879c.tar.gz
linux-stable-5bdcac88df0bbe80c636dce61cb211641a4e879c.tar.bz2
linux-stable-5bdcac88df0bbe80c636dce61cb211641a4e879c.zip
net/ibm/emac: wrong emac_calc_base call was used by typo
[ 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>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/ibm/emac/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 354c0982847b..372664686309 100644
--- 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 emac_instance *dev, int tx_size, int rx_s
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 emac_instance *dev, int tx_size, int rx_
case 16384:
ret |= EMAC4_MR1_RFS_16K;
break;
+ case 8192:
+ ret |= EMAC4_MR1_RFS_8K;
+ break;
case 4096:
ret |= EMAC4_MR1_RFS_4K;
break;