These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / ieee802154 / rdev-ops.h

diff --git a/kernel/net/ieee802154/rdev-ops.h b/kernel/net/ieee802154/rdev-ops.h
index 7b5a9dd..4441c63 100644 (file)
--- a/kernel/net/ieee802154/rdev-ops.h
+++ b/kernel/net/ieee802154/rdev-ops.h
@@ -23,6 +23,26 @@ rdev_del_virtual_intf_deprecated(struct cfg802154_registered_device *rdev,
        rdev->ops->del_virtual_intf_deprecated(&rdev->wpan_phy, dev);
 }
 
+static inline int
+rdev_suspend(struct cfg802154_registered_device *rdev)
+{
+       int ret;
+       trace_802154_rdev_suspend(&rdev->wpan_phy);
+       ret = rdev->ops->suspend(&rdev->wpan_phy);
+       trace_802154_rdev_return_int(&rdev->wpan_phy, ret);
+       return ret;
+}
+
+static inline int
+rdev_resume(struct cfg802154_registered_device *rdev)
+{
+       int ret;
+       trace_802154_rdev_resume(&rdev->wpan_phy);
+       ret = rdev->ops->resume(&rdev->wpan_phy);
+       trace_802154_rdev_return_int(&rdev->wpan_phy, ret);
+       return ret;
+}
+
 static inline int
 rdev_add_virtual_intf(struct cfg802154_registered_device *rdev, char *name,
                      unsigned char name_assign_type,
@@ -74,6 +94,29 @@ rdev_set_cca_mode(struct cfg802154_registered_device *rdev,
        return ret;
 }
 
+static inline int
+rdev_set_cca_ed_level(struct cfg802154_registered_device *rdev, s32 ed_level)
+{
+       int ret;
+
+       trace_802154_rdev_set_cca_ed_level(&rdev->wpan_phy, ed_level);
+       ret = rdev->ops->set_cca_ed_level(&rdev->wpan_phy, ed_level);
+       trace_802154_rdev_return_int(&rdev->wpan_phy, ret);
+       return ret;
+}
+
+static inline int
+rdev_set_tx_power(struct cfg802154_registered_device *rdev,
+                 s32 power)
+{
+       int ret;
+
+       trace_802154_rdev_set_tx_power(&rdev->wpan_phy, power);
+       ret = rdev->ops->set_tx_power(&rdev->wpan_phy, power);
+       trace_802154_rdev_return_int(&rdev->wpan_phy, ret);
+       return ret;
+}
+
 static inline int
 rdev_set_pan_id(struct cfg802154_registered_device *rdev,
                struct wpan_dev *wpan_dev, __le16 pan_id)
@@ -152,4 +195,126 @@ 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;
+}
+
+#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
+/* TODO this is already a nl802154, so move into ieee802154 */
+static inline void
+rdev_get_llsec_table(struct cfg802154_registered_device *rdev,
+                    struct wpan_dev *wpan_dev,
+                    struct ieee802154_llsec_table **table)
+{
+       rdev->ops->get_llsec_table(&rdev->wpan_phy, wpan_dev, table);
+}
+
+static inline void
+rdev_lock_llsec_table(struct cfg802154_registered_device *rdev,
+                     struct wpan_dev *wpan_dev)
+{
+       rdev->ops->lock_llsec_table(&rdev->wpan_phy, wpan_dev);
+}
+
+static inline void
+rdev_unlock_llsec_table(struct cfg802154_registered_device *rdev,
+                       struct wpan_dev *wpan_dev)
+{
+       rdev->ops->unlock_llsec_table(&rdev->wpan_phy, wpan_dev);
+}
+
+static inline int
+rdev_get_llsec_params(struct cfg802154_registered_device *rdev,
+                     struct wpan_dev *wpan_dev,
+                     struct ieee802154_llsec_params *params)
+{
+       return rdev->ops->get_llsec_params(&rdev->wpan_phy, wpan_dev, params);
+}
+
+static inline int
+rdev_set_llsec_params(struct cfg802154_registered_device *rdev,
+                     struct wpan_dev *wpan_dev,
+                     const struct ieee802154_llsec_params *params,
+                     u32 changed)
+{
+       return rdev->ops->set_llsec_params(&rdev->wpan_phy, wpan_dev, params,
+                                          changed);
+}
+
+static inline int
+rdev_add_llsec_key(struct cfg802154_registered_device *rdev,
+                  struct wpan_dev *wpan_dev,
+                  const struct ieee802154_llsec_key_id *id,
+                  const struct ieee802154_llsec_key *key)
+{
+       return rdev->ops->add_llsec_key(&rdev->wpan_phy, wpan_dev, id, key);
+}
+
+static inline int
+rdev_del_llsec_key(struct cfg802154_registered_device *rdev,
+                  struct wpan_dev *wpan_dev,
+                  const struct ieee802154_llsec_key_id *id)
+{
+       return rdev->ops->del_llsec_key(&rdev->wpan_phy, wpan_dev, id);
+}
+
+static inline int
+rdev_add_seclevel(struct cfg802154_registered_device *rdev,
+                 struct wpan_dev *wpan_dev,
+                 const struct ieee802154_llsec_seclevel *sl)
+{
+       return rdev->ops->add_seclevel(&rdev->wpan_phy, wpan_dev, sl);
+}
+
+static inline int
+rdev_del_seclevel(struct cfg802154_registered_device *rdev,
+                 struct wpan_dev *wpan_dev,
+                 const struct ieee802154_llsec_seclevel *sl)
+{
+       return rdev->ops->del_seclevel(&rdev->wpan_phy, wpan_dev, sl);
+}
+
+static inline int
+rdev_add_device(struct cfg802154_registered_device *rdev,
+               struct wpan_dev *wpan_dev,
+               const struct ieee802154_llsec_device *dev_desc)
+{
+       return rdev->ops->add_device(&rdev->wpan_phy, wpan_dev, dev_desc);
+}
+
+static inline int
+rdev_del_device(struct cfg802154_registered_device *rdev,
+               struct wpan_dev *wpan_dev, __le64 extended_addr)
+{
+       return rdev->ops->del_device(&rdev->wpan_phy, wpan_dev, extended_addr);
+}
+
+static inline int
+rdev_add_devkey(struct cfg802154_registered_device *rdev,
+               struct wpan_dev *wpan_dev, __le64 extended_addr,
+               const struct ieee802154_llsec_device_key *devkey)
+{
+       return rdev->ops->add_devkey(&rdev->wpan_phy, wpan_dev, extended_addr,
+                                    devkey);
+}
+
+static inline int
+rdev_del_devkey(struct cfg802154_registered_device *rdev,
+               struct wpan_dev *wpan_dev, __le64 extended_addr,
+               const struct ieee802154_llsec_device_key *devkey)
+{
+       return rdev->ops->del_devkey(&rdev->wpan_phy, wpan_dev, extended_addr,
+                                    devkey);
+}
+#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
+
 #endif /* __CFG802154_RDEV_OPS */