summaryrefslogtreecommitdiffstats
path: root/drivers/net/team/team.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2020-04-01 13:32:45 +0200
committerJiri Kosina <jkosina@suse.cz>2020-04-01 13:32:45 +0200
commit4c805fb704fc7890ec6615b286f09aeb5e2603d4 (patch)
tree24f79be444c9dd3df7116037fd3bd3e17b01ebd3 /drivers/net/team/team.c
parentf454d9a378a1ccb676adfa6e2449ef17e66696b5 (diff)
parent77a36a3ab4ff17fad23831192e3694a3c5a1750d (diff)
downloadlinux-4c805fb704fc7890ec6615b286f09aeb5e2603d4.tar.bz2
Merge branch 'for-5.7/glorious' into for-linus
- report descriptor fix for Glorious PC Gaming Race device from Samuel Čavoj
Diffstat (limited to 'drivers/net/team/team.c')
-rw-r--r--drivers/net/team/team.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index ca70a1d840eb..4004f98e50d9 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2240,6 +2240,8 @@ team_nl_option_policy[TEAM_ATTR_OPTION_MAX + 1] = {
[TEAM_ATTR_OPTION_CHANGED] = { .type = NLA_FLAG },
[TEAM_ATTR_OPTION_TYPE] = { .type = NLA_U8 },
[TEAM_ATTR_OPTION_DATA] = { .type = NLA_BINARY },
+ [TEAM_ATTR_OPTION_PORT_IFINDEX] = { .type = NLA_U32 },
+ [TEAM_ATTR_OPTION_ARRAY_INDEX] = { .type = NLA_U32 },
};
static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)