diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2016-10-24 14:40:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-27 16:16:09 -0400 |
| commit | a07ea4d9941af5a0c6f0be2a71b51ac9c083c5e5 (patch) | |
| tree | 52d22e6ed0079bb5a78d610c2ee33a783f070553 /net/ieee802154 | |
| parent | c90c39dab3e02ce45427a214746711f33ad13be6 (diff) | |
| download | linux-a07ea4d9941af5a0c6f0be2a71b51ac9c083c5e5.tar.gz linux-a07ea4d9941af5a0c6f0be2a71b51ac9c083c5e5.tar.bz2 linux-a07ea4d9941af5a0c6f0be2a71b51ac9c083c5e5.zip | |
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 'net/ieee802154')
| -rw-r--r-- | net/ieee802154/netlink.c | 1 | ||||
| -rw-r--r-- | net/ieee802154/nl802154.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c index c8133c07ceee..19144158b696 100644 --- a/net/ieee802154/netlink.c +++ b/net/ieee802154/netlink.c @@ -29,7 +29,6 @@ static unsigned int ieee802154_seq_num; static DEFINE_SPINLOCK(ieee802154_seq_lock); struct genl_family nl802154_family = { - .id = GENL_ID_GENERATE, .hdrsize = 0, .name = IEEE802154_NL_NAME, .version = 1, diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c index 21aabadccd0e..182299858f1d 100644 --- a/net/ieee802154/nl802154.c +++ b/net/ieee802154/nl802154.c @@ -34,7 +34,6 @@ static void nl802154_post_doit(const struct genl_ops *ops, struct sk_buff *skb, /* the netlink family */ static struct genl_family nl802154_fam = { - .id = GENL_ID_GENERATE, /* don't bother with a hardcoded ID */ .name = NL802154_GENL_NAME, /* have users key off the name instead */ .hdrsize = 0, /* no private header */ .version = 1, /* no particular meaning now */ |