From: David S. Miller Date: Wed, 29 Apr 2020 23:55:22 +0000 (-0700) Subject: Merge branch 'net-bcmgenet-add-support-for-Wake-on-Filter' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9e9f6e72a0f6c248c2eda230286eb1a71f2e146e;p=linux.git Merge branch 'net-bcmgenet-add-support-for-Wake-on-Filter' Doug Berger says: ==================== net: bcmgenet: add support for Wake on Filter Changes in v2: Corrected Signed-off-by for commit 3/7. This commit set adds support for waking from 'standby' using a Rx Network Flow Classification filter specified with ethtool. The first two commits are bug fixes that should be applied to the stable branches, but are included in this patch set to reduce merge conflicts that might occur if not applied before the other commits in this set. The next commit consolidates WoL clock managment as a part of the overall WoL configuration. The next commit restores a set of functions that were removed from the driver just prior to the 4.9 kernel release. The following commit relocates the functions in the file to prevent the need for additional forward declarations. Next, support for the Rx Network Flow Classification interface of ethtool is added. Finally, support for the WAKE_FILTER wol method is added. ==================== Signed-off-by: David S. Miller --- 9e9f6e72a0f6c248c2eda230286eb1a71f2e146e