summaryrefslogtreecommitdiffstats
path: root/net/unix
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-07-10 14:29:38 -0700
committerDavid S. Miller <davem@davemloft.net>2020-07-10 14:29:38 -0700
commitf9f41e3db40ee8d61b427d4d88c7365d968052a9 (patch)
tree6d134feb3286bd4131a0876627f9a1bc5bf680fd /net/unix
parentc8b1d7436045d3599bae56aef1682813ecccaad7 (diff)
parent6c8f85cac98a4c6b767c4c4f6af7283724c32b47 (diff)
downloadlinux-f9f41e3db40ee8d61b427d4d88c7365d968052a9.tar.gz
linux-f9f41e3db40ee8d61b427d4d88c7365d968052a9.tar.bz2
linux-f9f41e3db40ee8d61b427d4d88c7365d968052a9.zip
Merge branch 'macb-WOL-fixes'
Nicolas Ferre says: ==================== net: macb: Wake-on-Lan magic packet fixes and GEM handling Here is a split series to fix WoL magic-packet on the current macb driver. Only fixes in this one based on current net/master. Changes in v5: - Addressed the error code returned by phylink_ethtool_set_wol() as suggested by Russell. If PHY handles WoL, MAC doesn't stay in the way. - Removed Florian's tag on 3/5 because of the above changes. - Correct the "Fixes" tag on 1/5. Changes in v4: - Pure bug fix series for 'net'. GEM addition and MACB update removed: will be sent later. Changes in v3: - Revert some of the v2 changes done in macb_resume(). Now the resume function supports in-depth re-configuration of the controller in order to deal with deeper sleep states. Basically as it was before changes introduced by this series - Tested for non-regression with our deeper Power Management mode which cuts power to the controller completely Changes in v2: - Add patch 4/7 ("net: macb: fix macb_suspend() by removing call to netif_carrier_off()") needed for keeping phy state consistent - Add patch 5/7 ("net: macb: fix call to pm_runtime in the suspend/resume functions") that prevent putting the macb in runtime pm suspend mode when WoL is used - Collect review tags on 3 first patches from Florian: Thanks! - Review of macb_resume() function - Addition of pm_wakeup_event() in both MACB and GEM WoL IRQ handlers ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions