Fixed build error

- guint64 data type should be handled for each build machine type in
order to avoid build error.

Change-Id: Iede2da0a5c09c72db2e42dbba2638e97b9b1ef01
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/packaging/wifi-mesh-manager.spec b/packaging/wifi-mesh-manager.spec
index b451ff7..eb6f2b6 100644 (file)
--- a/packaging/wifi-mesh-manager.spec
+++ b/packaging/wifi-mesh-manager.spec
@@ -2,7 +2,7 @@
 
 Name:          wifi-mesh-manager
 Summary:       Wi-Fi mesh network daemon
-Version:       0.0.6
+Version:       0.0.7
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/src/wmesh-netlink.c b/src/wmesh-netlink.c
index 3e31be8..3b3ca0b 100644 (file)
--- a/src/wmesh-netlink.c
+++ b/src/wmesh-netlink.c
@@ -833,11 +833,11 @@ static int _on_receive_station_info(struct nl_msg *msg, void *arg)
        if (0 != sta_info[NL80211_STA_INFO_RX_BYTES]) {
                station_info->rx_bytes =
                                nla_get_u32(sta_info[NL80211_STA_INFO_RX_BYTES]);
-               WMESH_LOGD("    rx bytes:\t%u", station_info->rx_bytes);
+               WMESH_LOGD("    rx bytes:\t%" G_GUINT64_FORMAT, station_info->rx_bytes);
        } else if (0 != sta_info[NL80211_STA_INFO_RX_BYTES64]) {
                station_info->rx_bytes =
                        (unsigned long long)nla_get_u64(sta_info[NL80211_STA_INFO_RX_BYTES64]);
-               WMESH_LOGE("    rx bytes:\t%llu", station_info->rx_bytes);
+               WMESH_LOGE("    rx bytes:\t%" G_GUINT64_FORMAT, station_info->rx_bytes);
        }
 
        /* RX Packets */
@@ -851,11 +851,18 @@ static int _on_receive_station_info(struct nl_msg *msg, void *arg)
        if (0 != sta_info[NL80211_STA_INFO_TX_BYTES]) {
                station_info->tx_bytes =
                                nla_get_u32(sta_info[NL80211_STA_INFO_TX_BYTES]);
-               WMESH_LOGD("    tx bytes:\t%u", station_info->tx_bytes);
+               WMESH_LOGD("    tx bytes:\t%" G_GUINT64_FORMAT, station_info->tx_bytes);
        } else if (0 != sta_info[NL80211_STA_INFO_TX_BYTES64]) {
                station_info->tx_bytes =
                                (unsigned long long)nla_get_u64(sta_info[NL80211_STA_INFO_TX_BYTES64]);
-               WMESH_LOGD("    tx bytes:\t%llu", station_info->rx_packets);
+               WMESH_LOGD("    tx bytes:\t%" G_GUINT64_FORMAT, station_info->tx_bytes);
+       }
+
+       /* TX Packets */
+       if (0 != sta_info[NL80211_STA_INFO_TX_PACKETS]) {
+               station_info->tx_packets =
+                               nla_get_u32(sta_info[NL80211_STA_INFO_TX_PACKETS]);
+               WMESH_LOGD("    tx packets:\t%u", station_info->tx_packets);
        }
 
        /* LLID, PLID */
@@ -1074,7 +1081,7 @@ static int _on_receive_station_info(struct nl_msg *msg, void *arg)
        if (0 != sta_info[NL80211_STA_INFO_RX_DROP_MISC]) {
                station_info->rx_drop_misc =
                        (unsigned long long)nla_get_u64(sta_info[NL80211_STA_INFO_RX_DROP_MISC]);
-               WMESH_LOGD("    rx drop misc:\t%llu", station_info->rx_drop_misc);
+               WMESH_LOGD("    rx drop misc:\t%" G_GUINT64_FORMAT, station_info->rx_drop_misc);
        }
 #endif /* NL80211_STA_INFO_RX_DROP_MISC */
 
@@ -1082,7 +1089,7 @@ static int _on_receive_station_info(struct nl_msg *msg, void *arg)
        if (0 != sta_info[NL80211_STA_INFO_BEACON_RX]) {
                station_info->beacon_rx =
                                (unsigned long long)nla_get_u64(sta_info[NL80211_STA_INFO_BEACON_RX]);
-               WMESH_LOGD("    beacon rx:\t%llu", station_info->beacon_rx);
+               WMESH_LOGD("    beacon rx:\t%" G_GUINT64_FORMAT, station_info->beacon_rx);
        }
 #endif /* NL80211_STA_INFO_BEACON_RX */