ieee802154: add ack request default handling

This patch introduce a new mib entry which isn't part of 802.15.4 but
useful as default behaviour to set the ack request bit or not if we
don't know if the ack request bit should set. This is currently used for
stacks like IEEE 802.15.4 6LoWPAN.

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>

diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h
index e53b6bfda9765fa30fbe45c9f59e61c23d90c6b2..76b1ffaea863600be09280cc4c2d168dc5bae41f 100644 (file)
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
@@ -63,6 +63,8 @@ struct cfg802154_ops {
                                         s8 max_frame_retries);
        int     (*set_lbt_mode)(struct wpan_phy *wpan_phy,
                                struct wpan_dev *wpan_dev, bool mode);
+       int     (*set_ackreq_default)(struct wpan_phy *wpan_phy,
+                                     struct wpan_dev *wpan_dev, bool ackreq);
 };
 
 static inline bool
@@ -196,6 +198,9 @@ struct wpan_dev {
        bool lbt;
 
        bool promiscuous_mode;
+
+       /* fallback for acknowledgment bit setting */
+       bool ackreq;
 };
 
 #define to_phy(_dev)   container_of(_dev, struct wpan_phy, dev)

diff --git a/include/net/nl802154.h b/include/net/nl802154.h
index b0ab530d28cde08478beb19881965c9a24e030cc..cf2713d8b975f11c6f7ba6725af165a53b5e82bb 100644 (file)
--- a/include/net/nl802154.h
+++ b/include/net/nl802154.h
@@ -52,6 +52,8 @@ enum nl802154_commands {
 
        NL802154_CMD_SET_LBT_MODE,
 
+       NL802154_CMD_SET_ACKREQ_DEFAULT,
+
        /* add new commands above here */
 
        /* used to define NL802154_CMD_MAX below */
@@ -104,6 +106,8 @@ enum nl802154_attrs {
 
        NL802154_ATTR_SUPPORTED_COMMANDS,
 
+       NL802154_ATTR_ACKREQ_DEFAULT,
+
        /* add attributes here, update the policy in nl802154.c */
 
        __NL802154_ATTR_AFTER_LAST,

diff --git a/net/ieee802154/6lowpan/tx.c b/net/ieee802154/6lowpan/tx.c
index 2597abbf7f4bbbd121486306994f5e568de4d37e..1bf4a304b5c4e3505fed3b952716c7bc7a2d9a0e 100644 (file)
--- a/net/ieee802154/6lowpan/tx.c
+++ b/net/ieee802154/6lowpan/tx.c
@@ -224,7 +224,7 @@ static int lowpan_header(struct sk_buff *skb, struct net_device *dev)
        } else {
                da.mode = IEEE802154_ADDR_LONG;
                da.extended_addr = ieee802154_devaddr_from_raw(daddr);
-               cb->ackreq = wpan_dev->frame_retries >= 0;
+               cb->ackreq = wpan_dev->ackreq;
        }
 
        return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev,

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 68f24016860c30c7800b36d45046cf3e7f23b8c9..1b00a14850cb5f097b557079225c55c1abadab40 100644 (file)
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -230,6 +230,8 @@ static const struct nla_policy nl802154_policy[NL802154_ATTR_MAX+1] = {
        [NL802154_ATTR_WPAN_PHY_CAPS] = { .type = NLA_NESTED },
 
        [NL802154_ATTR_SUPPORTED_COMMANDS] = { .type = NLA_NESTED },
+
+       [NL802154_ATTR_ACKREQ_DEFAULT] = { .type = NLA_U8 },
 };
 
 /* message building helper */
@@ -458,6 +460,7 @@ static int nl802154_send_wpan_phy(struct cfg802154_registered_device *rdev,
        CMD(set_max_csma_backoffs, SET_MAX_CSMA_BACKOFFS);
        CMD(set_max_frame_retries, SET_MAX_FRAME_RETRIES);
        CMD(set_lbt_mode, SET_LBT_MODE);
+       CMD(set_ackreq_default, SET_ACKREQ_DEFAULT);
 
        if (rdev->wpan_phy.flags & WPAN_PHY_FLAG_TXPOWER)
                CMD(set_tx_power, SET_TX_POWER);
@@ -656,6 +659,10 @@ nl802154_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flags,
        if (nla_put_u8(msg, NL802154_ATTR_LBT_MODE, wpan_dev->lbt))
                goto nla_put_failure;
 
+       /* ackreq default behaviour */
+       if (nla_put_u8(msg, NL802154_ATTR_ACKREQ_DEFAULT, wpan_dev->ackreq))
+               goto nla_put_failure;
+
        genlmsg_end(msg, hdr);
        return 0;
 
@@ -1042,6 +1049,24 @@ static int nl802154_set_lbt_mode(struct sk_buff *skb, struct genl_info *info)
        return rdev_set_lbt_mode(rdev, wpan_dev, mode);
 }
 
+static int
+nl802154_set_ackreq_default(struct sk_buff *skb, struct genl_info *info)
+{
+       struct cfg802154_registered_device *rdev = info->user_ptr[0];
+       struct net_device *dev = info->user_ptr[1];
+       struct wpan_dev *wpan_dev = dev->ieee802154_ptr;
+       bool ackreq;
+
+       if (netif_running(dev))
+               return -EBUSY;
+
+       if (!info->attrs[NL802154_ATTR_ACKREQ_DEFAULT])
+               return -EINVAL;
+
+       ackreq = !!nla_get_u8(info->attrs[NL802154_ATTR_ACKREQ_DEFAULT]);
+       return rdev_set_ackreq_default(rdev, wpan_dev, ackreq);
+}
+
 #define NL802154_FLAG_NEED_WPAN_PHY    0x01
 #define NL802154_FLAG_NEED_NETDEV      0x02
 #define NL802154_FLAG_NEED_RTNL                0x04
@@ -1248,6 +1273,14 @@ static const struct genl_ops nl802154_ops[] = {
                .internal_flags = NL802154_FLAG_NEED_NETDEV |
                                  NL802154_FLAG_NEED_RTNL,
        },
+       {
+               .cmd = NL802154_CMD_SET_ACKREQ_DEFAULT,
+               .doit = nl802154_set_ackreq_default,
+               .policy = nl802154_policy,
+               .flags = GENL_ADMIN_PERM,
+               .internal_flags = NL802154_FLAG_NEED_NETDEV |
+                                 NL802154_FLAG_NEED_RTNL,
+       },
 };
 
 /* initialisation/exit functions */

diff --git a/net/ieee802154/rdev-ops.h b/net/ieee802154/rdev-ops.h
index 8d5960a37195136380032644b65a8b741a03ab00..03b357501cc55dc99c29a642d89975cbd2da87a0 100644 (file)
--- a/net/ieee802154/rdev-ops.h
+++ b/net/ieee802154/rdev-ops.h
@@ -195,4 +195,17 @@ rdev_set_lbt_mode(struct cfg802154_registered_device *rdev,
        return ret;
 }
 
+static inline int
+rdev_set_ackreq_default(struct cfg802154_registered_device *rdev,
+                       struct wpan_dev *wpan_dev, bool ackreq)
+{
+       int ret;
+
+       trace_802154_rdev_set_ackreq_default(&rdev->wpan_phy, wpan_dev,
+                                            ackreq);
+       ret = rdev->ops->set_ackreq_default(&rdev->wpan_phy, wpan_dev, ackreq);
+       trace_802154_rdev_return_int(&rdev->wpan_phy, ret);
+       return ret;
+}
+
 #endif /* __CFG802154_RDEV_OPS */

diff --git a/net/ieee802154/trace.h b/net/ieee802154/trace.h
index 4399b7fbaa31481c402079680e3509ed05fb9479..9a471e41ec737270a2d9f364564187f2736aaf19 100644 (file)
--- a/net/ieee802154/trace.h
+++ b/net/ieee802154/trace.h
@@ -275,6 +275,25 @@ TRACE_EVENT(802154_rdev_set_lbt_mode,
                WPAN_DEV_PR_ARG, BOOL_TO_STR(__entry->mode))
 );
 
+TRACE_EVENT(802154_rdev_set_ackreq_default,
+       TP_PROTO(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
+                bool ackreq),
+       TP_ARGS(wpan_phy, wpan_dev, ackreq),
+       TP_STRUCT__entry(
+               WPAN_PHY_ENTRY
+               WPAN_DEV_ENTRY
+               __field(bool, ackreq)
+       ),
+       TP_fast_assign(
+               WPAN_PHY_ASSIGN;
+               WPAN_DEV_ASSIGN;
+               __entry->ackreq = ackreq;
+       ),
+       TP_printk(WPAN_PHY_PR_FMT ", " WPAN_DEV_PR_FMT
+               ", ackreq default: %s", WPAN_PHY_PR_ARG,
+               WPAN_DEV_PR_ARG, BOOL_TO_STR(__entry->ackreq))
+);
+
 TRACE_EVENT(802154_rdev_return_int,
        TP_PROTO(struct wpan_phy *wpan_phy, int ret),
        TP_ARGS(wpan_phy, ret),

diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index cecfcda09aac898f4be27860c15d5519cb4d82b7..c865ebb2ace2b0b74cf3ba994c085790cde83da6 100644 (file)
--- a/net/mac802154/cfg.c
+++ b/net/mac802154/cfg.c
@@ -256,6 +256,16 @@ ieee802154_set_lbt_mode(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
        return 0;
 }
 
+static int
+ieee802154_set_ackreq_default(struct wpan_phy *wpan_phy,
+                             struct wpan_dev *wpan_dev, bool ackreq)
+{
+       ASSERT_RTNL();
+
+       wpan_dev->ackreq = ackreq;
+       return 0;
+}
+
 const struct cfg802154_ops mac802154_config_ops = {
        .add_virtual_intf_deprecated = ieee802154_add_iface_deprecated,
        .del_virtual_intf_deprecated = ieee802154_del_iface_deprecated,
@@ -273,4 +283,5 @@ const struct cfg802154_ops mac802154_config_ops = {
        .set_max_csma_backoffs = ieee802154_set_max_csma_backoffs,
        .set_max_frame_retries = ieee802154_set_max_frame_retries,
        .set_lbt_mode = ieee802154_set_lbt_mode,
+       .set_ackreq_default = ieee802154_set_ackreq_default,
 };