diff options
| author | André Draszik <draszik@google.com> | 2023-01-23 12:51:59 +0000 |
|---|---|---|
| committer | Will McVicker <willmcvicker@google.com> | 2023-05-03 15:38:08 -0700 |
| commit | 0d2bd247c831ff36d0819790b05a97a9066b7385 (patch) | |
| tree | 989f1c788974b741e36c2fd30bcc009df0fc3dd2 | |
| parent | 601db7b3f756fa0443bf2e9c4b33eb474038e260 (diff) | |
| download | uwb-0d2bd247c831ff36d0819790b05a97a9066b7385.tar.gz | |
mcps802154: fix compilation against v6.2 kernel (genl_family::pre_doit() ::post_doit())
Upstream kernel commit [1]
("genetlink: introduce split op representation")
has changed the prototypes of struct genl_family::pre_doit()
and struct genl_family::post_doit()
We need to follow suit here to make this driver compile again.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=20b0b53aca43
Bug: 266415169
Test: TH
Change-Id: Ie0b8b89c908d5e285d67fa35e3a3da2d9b9d52c0
Signed-off-by: André Draszik <draszik@google.com>
Signed-off-by: Will McVicker <willmcvicker@google.com>
| -rw-r--r-- | kernel/net/mcps802154/nl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/net/mcps802154/nl.c b/kernel/net/mcps802154/nl.c index 80e520b..c95480a 100644 --- a/kernel/net/mcps802154/nl.c +++ b/kernel/net/mcps802154/nl.c @@ -1104,7 +1104,7 @@ static struct mcps802154_local *mcps802154_get_from_info(struct genl_info *info) * * Return: 0 or error. */ -static int mcps802154_nl_pre_doit(const struct genl_ops *ops, +static int mcps802154_nl_pre_doit(const struct genl_split_ops *ops, struct sk_buff *skb, struct genl_info *info) { struct mcps802154_local *local; @@ -1130,7 +1130,7 @@ static int mcps802154_nl_pre_doit(const struct genl_ops *ops, * * Release RTNL if needed. */ -static void mcps802154_nl_post_doit(const struct genl_ops *ops, +static void mcps802154_nl_post_doit(const struct genl_split_ops *ops, struct sk_buff *skb, struct genl_info *info) { if (ops->internal_flags & MCPS802154_NL_NEED_HW) |