Merge tag 'xfs-for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / net / mac802154 / main.c

diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 08cb32dc8fd33e892e53f7f87f601b10ede8c38d..356b346e1ee86fdeadebf7be5d318c70dbc0d969 100644 (file)
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -107,6 +107,18 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)
 
        skb_queue_head_init(&local->skb_queue);
 
+       /* init supported flags with 802.15.4 default ranges */
+       phy->supported.max_minbe = 8;
+       phy->supported.min_maxbe = 3;
+       phy->supported.max_maxbe = 8;
+       phy->supported.min_frame_retries = -1;
+       phy->supported.max_frame_retries = 7;
+       phy->supported.max_csma_backoffs = 5;
+       phy->supported.lbt = NL802154_SUPPORTED_BOOL_FALSE;
+
+       /* always supported */
+       phy->supported.iftypes = BIT(NL802154_IFTYPE_NODE);
+
        return &local->hw;
 }
 EXPORT_SYMBOL(ieee802154_alloc_hw);
@@ -155,6 +167,26 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
 
        ieee802154_setup_wpan_phy_pib(local->phy);
 
+       if (!(hw->flags & IEEE802154_HW_CSMA_PARAMS)) {
+               local->phy->supported.min_csma_backoffs = 4;
+               local->phy->supported.max_csma_backoffs = 4;
+               local->phy->supported.min_maxbe = 5;
+               local->phy->supported.max_maxbe = 5;
+               local->phy->supported.min_minbe = 3;
+               local->phy->supported.max_minbe = 3;
+       }
+
+       if (!(hw->flags & IEEE802154_HW_FRAME_RETRIES)) {
+               /* TODO should be 3, but our default value is -1 which means
+                * no ARET handling.
+                */
+               local->phy->supported.min_frame_retries = -1;
+               local->phy->supported.max_frame_retries = -1;
+       }
+
+       if (hw->flags & IEEE802154_HW_PROMISCUOUS)
+               local->phy->supported.iftypes |= BIT(NL802154_IFTYPE_MONITOR);
+
        rc = wpan_phy_register(local->phy);
        if (rc < 0)
                goto out_wq;