kernel: fix swconfig compilation with kernels 5.2+
authorRafał Miłecki <rafal@milecki.pl>
Mon, 28 Oct 2019 15:59:49 +0000 (16:59 +0100)
committerRafał Miłecki <rafal@milecki.pl>
Mon, 28 Oct 2019 16:01:00 +0000 (17:01 +0100)
This is related to the upstream kernel change 3b0f31f2b8c9 ("genetlink:
make policy common to family").

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
target/linux/generic/files/drivers/net/phy/swconfig.c

index e8a684742cac8a561988cb6c6ce693b064f08ad7..20d6c693da5145348cae5f77772ed03a188907b4 100644 (file)
@@ -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),