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

[kvmfornfv.git] / kernel / net / mac802154 / driver-ops.h

diff --git a/kernel/net/mac802154/driver-ops.h b/kernel/net/mac802154/driver-ops.h
index a053335..0550f33 100644 (file)
--- a/kernel/net/mac802154/driver-ops.h
+++ b/kernel/net/mac802154/driver-ops.h
@@ -7,6 +7,7 @@
 #include <net/mac802154.h>
 
 #include "ieee802154_i.h"
+#include "trace.h"
 
 static inline int
 drv_xmit_async(struct ieee802154_local *local, struct sk_buff *skb)
@@ -27,19 +28,25 @@ drv_xmit_sync(struct ieee802154_local *local, struct sk_buff *skb)
 
 static inline int drv_start(struct ieee802154_local *local)
 {
+       int ret;
+
        might_sleep();
 
+       trace_802154_drv_start(local);
        local->started = true;
        smp_mb();
-
-       return local->ops->start(&local->hw);
+       ret = local->ops->start(&local->hw);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline void drv_stop(struct ieee802154_local *local)
 {
        might_sleep();
 
+       trace_802154_drv_stop(local);
        local->ops->stop(&local->hw);
+       trace_802154_drv_return_void(local);
 
        /* sync away all work on the tasklet before clearing started */
        tasklet_disable(&local->tasklet);
@@ -53,13 +60,20 @@ static inline void drv_stop(struct ieee802154_local *local)
 static inline int
 drv_set_channel(struct ieee802154_local *local, u8 page, u8 channel)
 {
+       int ret;
+
        might_sleep();
 
-       return local->ops->set_channel(&local->hw, page, channel);
+       trace_802154_drv_set_channel(local, page, channel);
+       ret = local->ops->set_channel(&local->hw, page, channel);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
-static inline int drv_set_tx_power(struct ieee802154_local *local, s8 dbm)
+static inline int drv_set_tx_power(struct ieee802154_local *local, s32 mbm)
 {
+       int ret;
+
        might_sleep();
 
        if (!local->ops->set_txpower) {
@@ -67,12 +81,17 @@ static inline int drv_set_tx_power(struct ieee802154_local *local, s8 dbm)
                return -EOPNOTSUPP;
        }
 
-       return local->ops->set_txpower(&local->hw, dbm);
+       trace_802154_drv_set_tx_power(local, mbm);
+       ret = local->ops->set_txpower(&local->hw, mbm);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline int drv_set_cca_mode(struct ieee802154_local *local,
                                   const struct wpan_phy_cca *cca)
 {
+       int ret;
+
        might_sleep();
 
        if (!local->ops->set_cca_mode) {
@@ -80,11 +99,16 @@ static inline int drv_set_cca_mode(struct ieee802154_local *local,
                return -EOPNOTSUPP;
        }
 
-       return local->ops->set_cca_mode(&local->hw, cca);
+       trace_802154_drv_set_cca_mode(local, cca);
+       ret = local->ops->set_cca_mode(&local->hw, cca);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline int drv_set_lbt_mode(struct ieee802154_local *local, bool mode)
 {
+       int ret;
+
        might_sleep();
 
        if (!local->ops->set_lbt) {
@@ -92,12 +116,17 @@ static inline int drv_set_lbt_mode(struct ieee802154_local *local, bool mode)
                return -EOPNOTSUPP;
        }
 
-       return local->ops->set_lbt(&local->hw, mode);
+       trace_802154_drv_set_lbt_mode(local, mode);
+       ret = local->ops->set_lbt(&local->hw, mode);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline int
-drv_set_cca_ed_level(struct ieee802154_local *local, s32 ed_level)
+drv_set_cca_ed_level(struct ieee802154_local *local, s32 mbm)
 {
+       int ret;
+
        might_sleep();
 
        if (!local->ops->set_cca_ed_level) {
@@ -105,12 +134,16 @@ drv_set_cca_ed_level(struct ieee802154_local *local, s32 ed_level)
                return -EOPNOTSUPP;
        }
 
-       return local->ops->set_cca_ed_level(&local->hw, ed_level);
+       trace_802154_drv_set_cca_ed_level(local, mbm);
+       ret = local->ops->set_cca_ed_level(&local->hw, mbm);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline int drv_set_pan_id(struct ieee802154_local *local, __le16 pan_id)
 {
        struct ieee802154_hw_addr_filt filt;
+       int ret;
 
        might_sleep();
 
@@ -121,14 +154,18 @@ static inline int drv_set_pan_id(struct ieee802154_local *local, __le16 pan_id)
 
        filt.pan_id = pan_id;
 
-       return local->ops->set_hw_addr_filt(&local->hw, &filt,
+       trace_802154_drv_set_pan_id(local, pan_id);
+       ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
                                            IEEE802154_AFILT_PANID_CHANGED);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline int
 drv_set_extended_addr(struct ieee802154_local *local, __le64 extended_addr)
 {
        struct ieee802154_hw_addr_filt filt;
+       int ret;
 
        might_sleep();
 
@@ -139,14 +176,18 @@ drv_set_extended_addr(struct ieee802154_local *local, __le64 extended_addr)
 
        filt.ieee_addr = extended_addr;
 
-       return local->ops->set_hw_addr_filt(&local->hw, &filt,
+       trace_802154_drv_set_extended_addr(local, extended_addr);
+       ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
                                            IEEE802154_AFILT_IEEEADDR_CHANGED);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline int
 drv_set_short_addr(struct ieee802154_local *local, __le16 short_addr)
 {
        struct ieee802154_hw_addr_filt filt;
+       int ret;
 
        might_sleep();
 
@@ -157,14 +198,18 @@ drv_set_short_addr(struct ieee802154_local *local, __le16 short_addr)
 
        filt.short_addr = short_addr;
 
-       return local->ops->set_hw_addr_filt(&local->hw, &filt,
+       trace_802154_drv_set_short_addr(local, short_addr);
+       ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
                                            IEEE802154_AFILT_SADDR_CHANGED);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline int
 drv_set_pan_coord(struct ieee802154_local *local, bool is_coord)
 {
        struct ieee802154_hw_addr_filt filt;
+       int ret;
 
        might_sleep();
 
@@ -175,14 +220,19 @@ drv_set_pan_coord(struct ieee802154_local *local, bool is_coord)
 
        filt.pan_coord = is_coord;
 
-       return local->ops->set_hw_addr_filt(&local->hw, &filt,
+       trace_802154_drv_set_pan_coord(local, is_coord);
+       ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
                                            IEEE802154_AFILT_PANC_CHANGED);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline int
 drv_set_csma_params(struct ieee802154_local *local, u8 min_be, u8 max_be,
                    u8 max_csma_backoffs)
 {
+       int ret;
+
        might_sleep();
 
        if (!local->ops->set_csma_params) {
@@ -190,13 +240,19 @@ drv_set_csma_params(struct ieee802154_local *local, u8 min_be, u8 max_be,
                return -EOPNOTSUPP;
        }
 
-       return local->ops->set_csma_params(&local->hw, min_be, max_be,
+       trace_802154_drv_set_csma_params(local, min_be, max_be,
+                                        max_csma_backoffs);
+       ret = local->ops->set_csma_params(&local->hw, min_be, max_be,
                                           max_csma_backoffs);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline int
 drv_set_max_frame_retries(struct ieee802154_local *local, s8 max_frame_retries)
 {
+       int ret;
+
        might_sleep();
 
        if (!local->ops->set_frame_retries) {
@@ -204,12 +260,17 @@ drv_set_max_frame_retries(struct ieee802154_local *local, s8 max_frame_retries)
                return -EOPNOTSUPP;
        }
 
-       return local->ops->set_frame_retries(&local->hw, max_frame_retries);
+       trace_802154_drv_set_max_frame_retries(local, max_frame_retries);
+       ret = local->ops->set_frame_retries(&local->hw, max_frame_retries);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 static inline int
 drv_set_promiscuous_mode(struct ieee802154_local *local, bool on)
 {
+       int ret;
+
        might_sleep();
 
        if (!local->ops->set_promiscuous_mode) {
@@ -217,7 +278,10 @@ drv_set_promiscuous_mode(struct ieee802154_local *local, bool on)
                return -EOPNOTSUPP;
        }
 
-       return local->ops->set_promiscuous_mode(&local->hw, on);
+       trace_802154_drv_set_promiscuous_mode(local, on);
+       ret = local->ops->set_promiscuous_mode(&local->hw, on);
+       trace_802154_drv_return_int(local, ret);
+       return ret;
 }
 
 #endif /* __MAC802154_DRIVER_OPS */