aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPhoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>2014-03-31 15:37:46 -0400
committerDavid S. Miller <davem@davemloft.net>2014-04-01 16:25:51 -0400
commite462ded699aa2cca04b68fbf203ea4675d4c44d4 (patch)
tree4c7b2f9d1e456acad01eb052f2dfa7d8533d92d8 /include/linux
parent336908f6d73ca297bd46948eb5d04d2020a88606 (diff)
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 'include/linux')
-rw-r--r--include/linux/nl802154.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index e110b8c266f5..c8d7f3965fff 100644
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -132,7 +132,7 @@ enum {
132 IEEE802154_ADD_IFACE, 132 IEEE802154_ADD_IFACE,
133 IEEE802154_DEL_IFACE, 133 IEEE802154_DEL_IFACE,
134 134
135 IEEE802154_SET_PHYPARAMS, 135 IEEE802154_SET_MACPARAMS,
136 136
137 __IEEE802154_CMD_MAX, 137 __IEEE802154_CMD_MAX,
138}; 138};