aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/xfrm.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-06-23 20:53:28 -0700
committerDavid S. Miller <davem@davemloft.net>2020-06-23 20:53:28 -0700
commit0275875530f692c725c6f993aced2eca2d6ac50c (patch)
tree80a99ec14173d14095e261890736496170cebe8f /include/net/xfrm.h
parentnet: Do not clear the sock TX queue in sk_set_socket() (diff)
parentnet: phylink: ensure manual pause mode configuration takes effect (diff)
downloadlinux-dev-0275875530f692c725c6f993aced2eca2d6ac50c.tar.xz
linux-dev-0275875530f692c725c6f993aced2eca2d6ac50c.zip
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>
Diffstat (limited to 'include/net/xfrm.h')
0 files changed, 0 insertions, 0 deletions