SW/openwrt
2
0
Fork 0
forked from Ivasoft/openwrt
Code Pull Requests Activity

target: remove obsolete kernel version switches for 4.19

Browse Source 
This removes unneeded kernel version switches from the targets after
kernel 4.19 has been dropped.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler
2020-10-01 17:02:47 +02:00
parent ac5671f46c
commit 2aa558c49a
10 changed files with 2 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
target/linux/generic/files/drivers/net/phy/swconfig.c
View File

@@ -591,13 +591,8 @@ swconfig_parse_ports(struct sk_buff *msg, struct nlattr *head,
port = &val->value.ports[val->len];
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
if (nla_parse_nested_deprecated(tb, SWITCH_PORT_ATTR_MAX, nla,
port_policy, NULL))
#else
if (nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, nla,
port_policy, NULL))
#endif
return -EINVAL;
if (!tb[SWITCH_PORT_ID])
@@ -618,11 +613,7 @@ swconfig_parse_link(struct sk_buff *msg, struct nlattr *nla,
{
struct nlattr *tb[SWITCH_LINK_ATTR_MAX + 1];
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
if (nla_parse_nested_deprecated(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy, NULL))
#else
if (nla_parse_nested(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy, NULL))
#endif
return -EINVAL;
link->duplex = !!tb[SWITCH_LINK_FLAG_DUPLEX];
@@ -1000,106 +991,56 @@ swconfig_done(struct netlink_callback *cb)
static struct genl_ops swconfig_ops[] = {
{
.cmd = SWITCH_CMD_LIST_GLOBAL,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
#endif
.doit = swconfig_list_attrs,
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
.policy = switch_policy,
#endif
},
{
.cmd = SWITCH_CMD_LIST_VLAN,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
#endif
.doit = swconfig_list_attrs,
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
.policy = switch_policy,
#endif
},
{
.cmd = SWITCH_CMD_LIST_PORT,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
#endif
.doit = swconfig_list_attrs,
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
.policy = switch_policy,
#endif
},
{
.cmd = SWITCH_CMD_GET_GLOBAL,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
#endif
.doit = swconfig_get_attr,
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
.policy = switch_policy,
#endif
},
{
.cmd = SWITCH_CMD_GET_VLAN,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
#endif
.doit = swconfig_get_attr,
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
.policy = switch_policy,
#endif
},
{
.cmd = SWITCH_CMD_GET_PORT,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
#endif
.doit = swconfig_get_attr,
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
.policy = switch_policy,
#endif
},
{
.cmd = SWITCH_CMD_SET_GLOBAL,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
#endif
.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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
#endif
.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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
#endif
.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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
#endif
.dumpit = swconfig_dump_switches,
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
.policy = switch_policy,
#endif
.done = swconfig_done,
}
};
@@ -1109,9 +1050,7 @@ 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),