diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2017-05-23 07:20:43 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-05-29 10:40:07 (GMT) |
| commit | 32d13c0058fd1beacb091c1d57999854819c3bc2 (patch) | |
| tree | 625bd7d80b22cb81964ba8cedd17cb653e967bb6 /lib | |
| parent | dad421eaac61cde08945a4fc42f4cd16d2ad5607 (diff) | |
| download | libnl-32d13c0058fd1beacb091c1d57999854819c3bc2.zip libnl-32d13c0058fd1beacb091c1d57999854819c3bc2.tar.gz libnl-32d13c0058fd1beacb091c1d57999854819c3bc2.tar.bz2 | |
genl: drop usage of GENL_ID_GENERATE
After kernel commit a07ea4d9941a ("genetlink: no longer support using
static family IDs"), GENL_ID_GENERATE is no longer exposed to userspace
(and actually should never have been). Update the private header copy of
linux/genetlink.h accordingly. And replace the two occurences of
GENL_ID_GENERATE.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
https://github.com/thom311/libnl/pull/144
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/genl/family.c | 2 | ||||
| -rw-r--r-- | lib/genl/mngt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/genl/family.c b/lib/genl/family.c index 45c3d45..0ba21cb 100644 --- a/lib/genl/family.c +++ b/lib/genl/family.c @@ -215,7 +215,7 @@ unsigned int genl_family_get_id(struct genl_family *family) if (family->ce_mask & FAMILY_ATTR_ID) return family->gf_id; else - return GENL_ID_GENERATE; + return 0; } /** diff --git a/lib/genl/mngt.c b/lib/genl/mngt.c index 3648663..ebfe85e 100644 --- a/lib/genl/mngt.c +++ b/lib/genl/mngt.c @@ -313,7 +313,7 @@ int genl_resolve_id(struct genl_ops *ops) int err = 0; /* Check if resolved already */ - if (ops->o_id != GENL_ID_GENERATE) + if (ops->o_id != 0) return 0; if (!ops->o_name) |