From: Aaron Komisar Date: Thu, 24 May 2018 10:57:33 +0000 (+0300) Subject: backports: update id field in backports genl family X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=c6e4ad12e850b0251242de8ebc01b649dccf9230;p=openwrt%2Fstaging%2Fblogic.git backports: update id field in backports genl family Family ID from the original family struct will be used when building genl messages (sent as nlmsg_type), so the new id should be updated in the original (older kernel format) family struct too Signed-off-by: Aaron Komisar Signed-off-by: Johannes Berg --- diff --git a/backport/compat/backport-4.12.c b/backport/compat/backport-4.12.c index 2372a118c82d..4948b531daab 100644 --- a/backport/compat/backport-4.12.c +++ b/backport/compat/backport-4.12.c @@ -225,6 +225,13 @@ int bp_extack_genl_register_family(struct genl_family *family) /* copy this since the family might access it directly */ family->id = copy->family.id; family->attrbuf = copy->family.attrbuf; + + /* family ID from the original family struct will be used when building + * genl messages (sent as nlmsg_type), so the new id should be updated + * in the original (older kernel format) family struct too + */ + family->family.id = copy->family.id; + #if LINUX_VERSION_IS_GEQ(3,13,0) family->mcgrp_offset = copy->family.mcgrp_offset; #endif