diff options
| author | David S. Miller <davem@davemloft.net> | 2013-11-19 21:39:42 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-19 21:39:42 (GMT) |
| commit | 091e0662ee2c37867ad918ce7b6ddd17f0e090e2 (patch) | |
| tree | e5a066d8f83d8822d448421019a4503f361295f9 /net/ieee802154/ieee802154.h | |
| parent | dbde497966804e63a38fdedc1e3815e77097efc2 (diff) | |
| parent | 2a94fe48f32ccf7321450a2cc07f2b724a444e5b (diff) | |
| download | linux-fsl-qoriq-091e0662ee2c37867ad918ce7b6ddd17f0e090e2.tar.xz | |
Merge branch 'genetlink_mcast'
Johannes Berg says:
====================
genetlink: clean up multicast group APIs
The generic netlink multicast group registration doesn't have to
be dynamic, and can thus be simplified just like I did with the
ops. This removes some complexity in registration code.
Additionally, two users of generic netlink already use multicast
groups in a wrong way, add workarounds for those two to keep the
userspace API working, but at the same time make them not clash
with other users of multicast groups as might happen now.
While making it all a bit easier, also prevent such abuse by adding
checks to the APIs so each family can only use the groups it owns.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ieee802154/ieee802154.h')
| -rw-r--r-- | net/ieee802154/ieee802154.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ieee802154/ieee802154.h b/net/ieee802154/ieee802154.h index 14d5dab..cee4425 100644 --- a/net/ieee802154/ieee802154.h +++ b/net/ieee802154/ieee802154.h @@ -54,8 +54,10 @@ int ieee802154_dump_phy(struct sk_buff *skb, struct netlink_callback *cb); int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info); int ieee802154_del_iface(struct sk_buff *skb, struct genl_info *info); -extern struct genl_multicast_group ieee802154_coord_mcgrp; -extern struct genl_multicast_group ieee802154_beacon_mcgrp; +enum ieee802154_mcgrp_ids { + IEEE802154_COORD_MCGRP, + IEEE802154_BEACON_MCGRP, +}; int ieee802154_associate_req(struct sk_buff *skb, struct genl_info *info); int ieee802154_associate_resp(struct sk_buff *skb, struct genl_info *info); |