diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2016-10-24 08:40:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-27 16:16:09 -0400 |
| commit | a07ea4d9941af5a0c6f0be2a71b51ac9c083c5e5 (patch) | |
| tree | 52d22e6ed0079bb5a78d610c2ee33a783f070553 /include/linux/genl_magic_func.h | |
| parent | c90c39dab3e02ce45427a214746711f33ad13be6 (diff) | |
genetlink: no longer support using static family IDs
Static family IDs have never really been used, the only
use case was the workaround I introduced for those users
that assumed their family ID was also their multicast
group ID.
Additionally, because static family IDs would never be
reserved by the generic netlink code, using a relatively
low ID would only work for built-in families that can be
registered immediately after generic netlink is started,
which is basically only the control family (apart from
the workaround code, which I also had to add code for so
it would reserve those IDs)
Thus, anything other than GENL_ID_GENERATE is flawed and
luckily not used except in the cases I mentioned. Move
those workarounds into a few lines of code, and then get
rid of GENL_ID_GENERATE entirely, making it more robust.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/genl_magic_func.h')
| -rw-r--r-- | include/linux/genl_magic_func.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h index 667c31101b8b..7c070c1fe457 100644 --- a/include/linux/genl_magic_func.h +++ b/include/linux/genl_magic_func.h | |||
| @@ -260,7 +260,6 @@ static struct genl_ops ZZZ_genl_ops[] __read_mostly = { | |||
| 260 | */ | 260 | */ |
| 261 | #define ZZZ_genl_family CONCAT_(GENL_MAGIC_FAMILY, _genl_family) | 261 | #define ZZZ_genl_family CONCAT_(GENL_MAGIC_FAMILY, _genl_family) |
| 262 | static struct genl_family ZZZ_genl_family __read_mostly = { | 262 | static struct genl_family ZZZ_genl_family __read_mostly = { |
| 263 | .id = GENL_ID_GENERATE, | ||
| 264 | .name = __stringify(GENL_MAGIC_FAMILY), | 263 | .name = __stringify(GENL_MAGIC_FAMILY), |
| 265 | .version = GENL_MAGIC_VERSION, | 264 | .version = GENL_MAGIC_VERSION, |
| 266 | #ifdef GENL_MAGIC_FAMILY_HDRSZ | 265 | #ifdef GENL_MAGIC_FAMILY_HDRSZ |
