From e6ee1ad72cb5cb21e9cce1f64ecc7914270b1ef4 Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Fri, 18 Mar 2016 12:03:01 +0100
Subject: [PATCH] Move some static buffer declarations from .h files to .c
 files

This avoids these buffers getting added to all .o files.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 core/rtw_recv.c           | 9 +++++++++
 include/rtw_recv.h        | 4 ++++
 os_dep/linux/recv_linux.c | 6 ++++++
 3 files changed, 19 insertions(+)

diff --git a/core/rtw_recv.c b/core/rtw_recv.c
index 68a73cc..35b5f53 100755
--- a/core/rtw_recv.c
+++ b/core/rtw_recv.c
@@ -28,6 +28,15 @@
 
 #endif
 
+static u8 rtw_rfc1042_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
+static u8 rtw_bridge_tunnel_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
+
+static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37};
+
+static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3};
 
 #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
 void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS);
diff --git a/include/rtw_recv.h b/include/rtw_recv.h
index d2cc52d..cc1e58c 100755
--- a/include/rtw_recv.h
+++ b/include/rtw_recv.h
@@ -75,6 +75,7 @@
 #define RX_CMD_QUEUE				1
 #define RX_MAX_QUEUE				2
 
+#if 0 // jfm
 static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37};
 
 static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3};
@@ -84,13 +85,16 @@ static u8 SNAP_HDR_APPLETALK_DDP[3] = {0x08, 0x00, 0x07}; // Datagram Delivery P
 
 static u8 oui_8021h[] = {0x00, 0x00, 0xf8};
 static u8 oui_rfc1042[]= {0x00,0x00,0x00};
+#endif
 
 #define MAX_SUBFRAME_COUNT	64
+#if 0 // jfm
 static u8 rtw_rfc1042_header[] =
 { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
 /* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
 static u8 rtw_bridge_tunnel_header[] =
 { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
+#endif
 
 //for Rx reordering buffer control
 struct recv_reorder_ctrl
diff --git a/os_dep/linux/recv_linux.c b/os_dep/linux/recv_linux.c
index 55009fb..53b8ef5 100644
--- a/os_dep/linux/recv_linux.c
+++ b/os_dep/linux/recv_linux.c
@@ -21,6 +21,12 @@
 
 #include <drv_types.h>
 
+static u8 rtw_rfc1042_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
+static u8 rtw_bridge_tunnel_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
+
 int rtw_os_alloc_recvframe(_adapter *padapter, union recv_frame *precvframe, u8 *pdata, _pkt *pskb)
 {
 	int res = _SUCCESS;