-some more wlan code cleanup

2 files changed, 8 insertions, 7 deletions

diff --git a/src/transport/gnunet-transport-wlan-helper.c b/src/transport/gnunet-transport-wlan-helper.c
index c8f5a03fb..0e5d55b40 100644
--- a/src/transport/gnunet-transport-wlan-helper.c
+++ b/src/transport/gnunet-transport-wlan-helper.c
@@ -104,14 +104,10 @@
 #include "gnunet_server_lib.h"
 #include "plugin_transport_wlan.h"
 
-#define DEBUG 1
-
 #define ARPHRD_IEEE80211        801
 #define ARPHRD_IEEE80211_PRISM  802
 #define ARPHRD_IEEE80211_FULL   803
 
-#define MAC_ADDR_SIZE 6
-
 /**
  * size of 802.11 address
  */
@@ -458,7 +454,7 @@ struct ieee80211_radiotap_iterator
  * which can be found in the iterator's this_arg_index member.  This arg
  * index corresponds to the IEEE80211_RADIOTAP_... defines.
  */
-int
+static int
 ieee80211_radiotap_iterator_init (struct ieee80211_radiotap_iterator
                                   *iterator,
                                   struct ieee80211_radiotap_header
@@ -535,7 +531,7 @@ ieee80211_radiotap_iterator_init (struct ieee80211_radiotap_iterator
  * can be changed by the caller.  The args pointed to are in little-endian
  * format.
  */
-int
+static int
 ieee80211_radiotap_iterator_next (struct ieee80211_radiotap_iterator
                                   *iterator)
 {
diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h
index 628ec85c2..7f6668cd3 100644
--- a/src/transport/plugin_transport_wlan.h
+++ b/src/transport/plugin_transport_wlan.h
@@ -30,9 +30,14 @@
 #include <stdint.h>
 #include "gnunet_common.h"
 
+/**
+ * Number fo bytes in a mac address.
+ */
+#define MAC_ADDR_SIZE 6
+
 struct MacAddress
 {
-  u_int8_t mac[6];
+  uint8_t mac[MAC_ADDR_SIZE];
 };
 
 struct Wlan_Helper_Control_Message