From: Jakub Kicinski Date: Fri, 20 Aug 2021 01:09:18 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f444fea7896dbc267249d27f604082a51b8efca2;p=linux.git Merge git://git./linux/kernel/git/netdev/net drivers/ptp/Kconfig: 55c8fca1dae1 ("ptp_pch: Restore dependency on PCI") e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies") Signed-off-by: Jakub Kicinski --- f444fea7896dbc267249d27f604082a51b8efca2 diff --cc drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c index d260993ab2dcc,98cc0133c3437..1419c8dccea2c --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c @@@ -3204,12 -3083,10 +3206,10 @@@ static int dpaa2_switch_remove(struct f } kfree(ethsw->fdbs); - kfree(ethsw->acls); + kfree(ethsw->filter_blocks); kfree(ethsw->ports); - dpaa2_switch_takedown(sw_dev); - - destroy_workqueue(ethsw->workqueue); + dpaa2_switch_teardown(sw_dev); fsl_mc_portal_free(ethsw->mc_io); diff --cc drivers/ptp/Kconfig index 8ad88c3e79aa4,e085c255da0c1..32660dc113546 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@@ -103,8 -90,9 +103,9 @@@ config PTP_1588_CLOCK_INE config PTP_1588_CLOCK_PCH tristate "Intel PCH EG20T as PTP clock" depends on X86_32 || COMPILE_TEST - depends on HAS_IOMEM && NET + depends on HAS_IOMEM && PCI + depends on NET - imply PTP_1588_CLOCK + depends on PTP_1588_CLOCK help This driver adds support for using the PCH EG20T as a PTP clock. The hardware supports time stamping of PTP packets