diff options
author | Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> | 2014-03-31 21:37:46 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-01 16:25:51 -0400 |
commit | e462ded699aa2cca04b68fbf203ea4675d4c44d4 (patch) | |
tree | 4c7b2f9d1e456acad01eb052f2dfa7d8533d92d8 /net/ieee802154/ieee802154.h | |
parent | 336908f6d73ca297bd46948eb5d04d2020a88606 (diff) | |
download | linux-e462ded699aa2cca04b68fbf203ea4675d4c44d4.tar.gz linux-e462ded699aa2cca04b68fbf203ea4675d4c44d4.tar.bz2 linux-e462ded699aa2cca04b68fbf203ea4675d4c44d4.zip |
mac802154: make csma/cca parameters per-wpan
Commit 9b2777d6089bcd (ieee802154: add TX power control to wpan_phy)
and following erroneously added CSMA and CCA parameters for 802.15.4
devices as PHY parameters, while they are actually MAC parameters and
can differ for any two WPAN instances. Since it is now sensible to have
multiple WPAN devices with differing CSMA/CCA parameters, make these
parameters MAC parameters instead.
Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ieee802154/ieee802154.h')
-rw-r--r-- | net/ieee802154/ieee802154.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/ieee802154.h b/net/ieee802154/ieee802154.h index 6cbc8965be91..6693a5cf01ce 100644 --- a/net/ieee802154/ieee802154.h +++ b/net/ieee802154/ieee802154.h @@ -53,7 +53,6 @@ int ieee802154_list_phy(struct sk_buff *skb, struct genl_info *info); 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); -int ieee802154_set_phyparams(struct sk_buff *skb, struct genl_info *info); enum ieee802154_mcgrp_ids { IEEE802154_COORD_MCGRP, @@ -67,5 +66,6 @@ int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info); int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info); int ieee802154_list_iface(struct sk_buff *skb, struct genl_info *info); int ieee802154_dump_iface(struct sk_buff *skb, struct netlink_callback *cb); +int ieee802154_set_macparams(struct sk_buff *skb, struct genl_info *info); #endif |