summaryrefslogtreecommitdiffstats
path: root/net/mac802154/iface.c
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2015-08-10 21:15:56 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-08-10 20:43:06 +0200
commit89c7d788f89d58136a2e5596796c298942ee32d6 (patch)
tree931c60095f4540cdc5ab2a66259d5aabef8a8b7e /net/mac802154/iface.c
parent91f02b3dd8311b48c021e8667a84dfc2d6445a03 (diff)
downloadblackbird-op-linux-89c7d788f89d58136a2e5596796c298942ee32d6.tar.gz
blackbird-op-linux-89c7d788f89d58136a2e5596796c298942ee32d6.zip
mac802154: change frame_retries behaviour
This patch changes the default minimum value of frame_retries to 0 and changes the frame_retries default value to 3 which is also 802.15.4 default. We don't use the frame_retries "-1" value as indicator for no-aret mode anymore, instead we checking on the ack request bit inside the 802.15.4 frame control field. This allows a acknowledge handling per frame. This checking is done by transceiver or inside xmit callback of driver layer. If a transceiver doesn't support ARET handling the transmit functionality ignores ack frames then, which isn't well but should not effect anything of current functionality. Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com> Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154/iface.c')
-rw-r--r--net/mac802154/iface.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index ff99055631f9..ed26952f9e14 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -498,8 +498,7 @@ ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata,
wpan_dev->min_be = 3;
wpan_dev->max_be = 5;
wpan_dev->csma_retries = 4;
- /* for compatibility, actual default is 3 */
- wpan_dev->frame_retries = -1;
+ wpan_dev->frame_retries = 3;
wpan_dev->pan_id = cpu_to_le16(IEEE802154_PANID_BROADCAST);
wpan_dev->short_addr = cpu_to_le16(IEEE802154_ADDR_BROADCAST);
OpenPOWER on IntegriCloud