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.

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index c8491f69ccd3569ae35f0f62a0514c3834b512c9..4de98b6224265f60072b2e707977e8ebdaaa1e27 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -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};
 

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
index 540c5adae82c2b5d5dca99e2898f48830f4d5ebb..b1b1584af1cdc3999ec48303a16ef7435988fd4e 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
@@ -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>

diff --git a/drivers/staging/rtl8188eu/include/ethernet.h b/drivers/staging/rtl8188eu/include/ethernet.h
deleted file mode 100644 (file)
index a59f912..0000000
--- a/drivers/staging/rtl8188eu/include/ethernet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- ******************************************************************************/
-/*! \file */
-#ifndef __INC_ETHERNET_H
-#define __INC_ETHERNET_H
-
-#define ETHERNET_ADDRESS_LENGTH                6       /*  Ethernet Address Length */
-#define ETHERNET_HEADER_SIZE           14      /*  Ethernet Header Length */
-#define LLC_HEADER_SIZE                        6       /*  LLC Header Length */
-#define TYPE_LENGTH_FIELD_SIZE         2       /*  Type/Length Size */
-#define MINIMUM_ETHERNET_PACKET_SIZE   60      /*  Min Ethernet Packet Size */
-#define MAXIMUM_ETHERNET_PACKET_SIZE   1514    /*  Max Ethernet Packet Size */
-
-/*  Is Multicast Address? */
-#define RT_ETH_IS_MULTICAST(_addr)     ((((u8 *)(_addr))[0]&0x01) != 0)
-#define RT_ETH_IS_BROADCAST(_addr)     (                       \
-               ((u8 *)(_addr))[0] == 0xff &&           \
-               ((u8 *)(_addr))[1] == 0xff &&           \
-               ((u8 *)(_addr))[2] == 0xff &&           \
-               ((u8 *)(_addr))[3] == 0xff &&           \
-               ((u8 *)(_addr))[4] == 0xff &&           \
-               ((u8 *)(_addr))[5] == 0xff)     /*  Is Broadcast Address? */
-
-
-#endif /*  #ifndef __INC_ETHERNET_H */

diff --git a/drivers/staging/rtl8188eu/os_dep/recv_linux.c b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
index fd8ca60358f794c322efb69cd79d633bf4c04bbd..3eff225a0e39413fb7d695a01020059ac655cd52 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
@@ -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 */