From b49f2113cc750c093d3b55f228f820d8bfe029a9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 28 Oct 2019 16:59:49 +0100 Subject: [PATCH] kernel: fix swconfig compilation with kernels 5.2+ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is related to the upstream kernel change 3b0f31f2b8c9 ("genetlink: make policy common to family"). Signed-off-by: Rafał Miłecki --- .../generic/files/drivers/net/phy/swconfig.c | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c b/target/linux/generic/files/drivers/net/phy/swconfig.c index e8a684742c..20d6c693da 100644 --- a/target/linux/generic/files/drivers/net/phy/swconfig.c +++ b/target/linux/generic/files/drivers/net/phy/swconfig.c @@ -1001,55 +1001,75 @@ static struct genl_ops swconfig_ops[] = { { .cmd = SWITCH_CMD_LIST_GLOBAL, .doit = swconfig_list_attrs, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) .policy = switch_policy, +#endif }, { .cmd = SWITCH_CMD_LIST_VLAN, .doit = swconfig_list_attrs, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) .policy = switch_policy, +#endif }, { .cmd = SWITCH_CMD_LIST_PORT, .doit = swconfig_list_attrs, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) .policy = switch_policy, +#endif }, { .cmd = SWITCH_CMD_GET_GLOBAL, .doit = swconfig_get_attr, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) .policy = switch_policy, +#endif }, { .cmd = SWITCH_CMD_GET_VLAN, .doit = swconfig_get_attr, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) .policy = switch_policy, +#endif }, { .cmd = SWITCH_CMD_GET_PORT, .doit = swconfig_get_attr, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) .policy = switch_policy, +#endif }, { .cmd = SWITCH_CMD_SET_GLOBAL, .flags = GENL_ADMIN_PERM, .doit = swconfig_set_attr, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) .policy = switch_policy, +#endif }, { .cmd = SWITCH_CMD_SET_VLAN, .flags = GENL_ADMIN_PERM, .doit = swconfig_set_attr, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) .policy = switch_policy, +#endif }, { .cmd = SWITCH_CMD_SET_PORT, .flags = GENL_ADMIN_PERM, .doit = swconfig_set_attr, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) .policy = switch_policy, +#endif }, { .cmd = SWITCH_CMD_GET_SWITCH, .dumpit = swconfig_dump_switches, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) .policy = switch_policy, +#endif .done = swconfig_done, } }; @@ -1062,6 +1082,9 @@ static struct genl_family switch_fam = { .hdrsize = 0, .version = 1, .maxattr = SWITCH_ATTR_MAX, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0) + .policy = switch_policy, +#endif .module = THIS_MODULE, .ops = swconfig_ops, .n_ops = ARRAY_SIZE(swconfig_ops), -- 2.25.1