Moved rfc1042_header into driver_*.c that use it

No need to share such a small buffer and make hostapd.[ch] more complex
with it.

diff --git a/hostapd/driver_hostap.c b/hostapd/driver_hostap.c
index 6586372..045909c 100644 (file)
--- a/hostapd/driver_hostap.c
+++ b/hostapd/driver_hostap.c
@@ -42,6 +42,7 @@
 #include "hostap_common.h"
 #include "hw_features.h"
 
+static const u8 rfc1042_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
 
 struct hostap_driver_data {
        struct hostapd_data *hapd;

diff --git a/hostapd/driver_nl80211.c b/hostapd/driver_nl80211.c
index 3ed7652..eb9dd2f 100644 (file)
--- a/hostapd/driver_nl80211.c
+++ b/hostapd/driver_nl80211.c
@@ -46,6 +46,8 @@
 #define nl_handle_destroy nl_socket_free
 #endif /* CONFIG_LIBNL20 */
 
+static const u8 rfc1042_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+
 enum ieee80211_msg_type {
        ieee80211_msg_normal = 0,
        ieee80211_msg_tx_callback_ack = 1,

diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index f5fe132..35b8edd 100644 (file)
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -59,8 +59,6 @@ struct hapd_interfaces {
        struct hostapd_iface **iface;
 };
 
-unsigned char rfc1042_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
-
 
 extern int wpa_debug_level;
 extern int wpa_debug_show_keys;

diff --git a/hostapd/hostapd.h b/hostapd/hostapd.h
index e368aae..33c3e73 100644 (file)
--- a/hostapd/hostapd.h
+++ b/hostapd/hostapd.h
@@ -22,8 +22,6 @@
 #include "hostapd_defs.h"
 #include "config.h"
 
-extern unsigned char rfc1042_header[6];
-
 struct wpa_driver_ops;
 struct wpa_ctrl_dst;
 struct radius_server_data;