Skip to contentSkip to conversation

staging: rtl8188eu: remove header file ethernet.h

PATCH New navin patidar 1 participant 1 message Feb 12, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 3/3 staging: rtl8188eu: remove header file ethernet.h

"ethernet.h" is included in three files but only "rtw_recv.c" using two macros defined in "ethernet.h", so move used macros in "rtw_recv.c" and remove "include/ethernet.h" header file and inclusion of this header file.

v2:
First version of this patch failed to apply.

---
 drivers/staging/rtl8188eu/core/rtw_recv.c      |    4 ++-
 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c |    1 -
 drivers/staging/rtl8188eu/include/ethernet.h   |   42 ------------------------
 drivers/staging/rtl8188eu/os_dep/recv_linux.c  |    1 -
 4 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 drivers/staging/rtl8188eu/include/ethernet.h
drivers/staging/rtl8188eu/core/rtw_recv.c +3 -1
index c8491f6..4de98b6 100644
@@ -23,11 +23,13 @@
 #include <drv_types.h>
 #include <recv_osdep.h>
 #include <mlme_osdep.h>
-#include <ethernet.h>
 #include <usb_ops.h>
 #include <wifi.h>
 #include <linux/vmalloc.h>
 
+#define ETHERNET_HEADER_SIZE	14	/*  Ethernet Header Length */
+#define LLC_HEADER_SIZE			6	/*  LLC Header Length */
+
 static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37};
 static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3};
 
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -1
index 540c5ad..b1b1584 100644
@@ -22,7 +22,6 @@
 #include <drv_types.h>
 #include <recv_osdep.h>
 #include <mlme_osdep.h>
-#include <ethernet.h>
 
 #include <usb_ops.h>
 #include <wifi.h>
drivers/staging/rtl8188eu/include/ethernet.h deleted +0 -42

42 lines not on this page · raw message

drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -1
index fd8ca60..3eff225 100644
@@ -26,7 +26,6 @@
 #include <recv_osdep.h>
 
 #include <osdep_intf.h>
-#include <ethernet.h>
 #include <usb_ops.h>
 
 /* init os related resource in struct recv_priv */

--
1.7.10.4