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/wpan-class.c | |
| parent | 336908f6d73ca297bd46948eb5d04d2020a88606 (diff) | |
| download | blackbird-op-linux-e462ded699aa2cca04b68fbf203ea4675d4c44d4.tar.gz blackbird-op-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/wpan-class.c')
| -rw-r--r-- | net/ieee802154/wpan-class.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c index edd0962d55f9..8d6f6704da84 100644 --- a/net/ieee802154/wpan-class.c +++ b/net/ieee802154/wpan-class.c @@ -169,12 +169,6 @@ struct wpan_phy *wpan_phy_alloc(size_t priv_size) phy->current_channel = -1; /* not initialised */ phy->current_page = 0; /* for compatibility */ - /* defaults per 802.15.4-2011 */ - phy->min_be = 3; - phy->max_be = 5; - phy->csma_retries = 4; - phy->frame_retries = -1; /* for compatibility, actual default is 3 */ - return phy; out: |
