| Message ID | 1599294093-30758-1-git-send-email-pthombar@cadence.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: macb: fix for pause frame receive enable bit | expand |
On Sat, 5 Sep 2020 10:21:33 +0200 Parshuram Thombare wrote: > PAE bit of NCFGR register, when set, pauses transmission > if a non-zero 802.3 classic pause frame is received. > > Fixes: 7897b071ac3b ("net: macb: convert to phylink") > Signed-off-by: Parshuram Thombare <pthombar@cadence.com> Applied, thank you!
On 05/09/2020 at 10:21, Parshuram Thombare wrote: > PAE bit of NCFGR register, when set, pauses transmission > if a non-zero 802.3 classic pause frame is received. > > Fixes: 7897b071ac3b ("net: macb: convert to phylink") > Signed-off-by: Parshuram Thombare <pthombar@cadence.com> For the record: Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Thanks Parshuram for having found this issue. Best regards, Nicolas > --- > drivers/net/ethernet/cadence/macb_main.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index 6761f40..9179f7b 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -647,8 +647,7 @@ static void macb_mac_link_up(struct phylink_config *config, > ctrl |= GEM_BIT(GBE); > } > > - /* We do not support MLO_PAUSE_RX yet */ > - if (tx_pause) > + if (rx_pause) > ctrl |= MACB_BIT(PAE); > > macb_set_tx_clk(bp->tx_clk, speed, ndev); > -- > 1.7.1 >
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 6761f40..9179f7b 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -647,8 +647,7 @@ static void macb_mac_link_up(struct phylink_config *config, ctrl |= GEM_BIT(GBE); } - /* We do not support MLO_PAUSE_RX yet */ - if (tx_pause) + if (rx_pause) ctrl |= MACB_BIT(PAE); macb_set_tx_clk(bp->tx_clk, speed, ndev);
PAE bit of NCFGR register, when set, pauses transmission if a non-zero 802.3 classic pause frame is received. Fixes: 7897b071ac3b ("net: macb: convert to phylink") Signed-off-by: Parshuram Thombare <pthombar@cadence.com> --- drivers/net/ethernet/cadence/macb_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)