From: David S. Miller <davem@davemloft.net>
Date: Wed, 24 Jun 2020 03:53:28 +0000 (-0700)
Subject: Merge branch 'Two-phylink-pause-fixes'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0275875530f692c725c6f993aced2eca2d6ac50c;p=linux.git

Merge branch 'Two-phylink-pause-fixes'

Russell King says:

====================
Two phylink pause fixes

While testing, I discovered two issues with ethtool -A with phylink.
First, if there is a PHY bound to the network device, we hit a
deadlock when phylib tries to notify us of the link changing as a
result of triggering a renegotiation.

Second, when we are manually forcing the pause settings, and there
is no renegotiation triggered, we do not update the MAC via the new
mac_link_up approach.

These two patches solve both problems, and will need to be backported
to v5.7; they do not apply cleanly there due to the introduction of
PCS in the v5.8 merge window.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

0275875530f692c725c6f993aced2eca2d6ac50c