staging: rtl8188eu: remove header file if_ether.h
PATCH 1/3 staging: rtl8188eu: remove header file if_ether.h
"if_ether.h" is included in three files but not being used, so remove "include/if_ether.h" header file and inclusion of this header file.
--- drivers/staging/rtl8188eu/core/rtw_recv.c | 1 - drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/rtl8188eu/include/if_ether.h | 111 ------------------------ drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 1 - 4 files changed, 114 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/include/if_ether.h
drivers/staging/rtl8188eu/core/rtw_recv.c +0 -1
@@ -24,7 +24,6 @@#include <recv_osdep.h> #include <mlme_osdep.h> #include <ip.h> -#include <if_ether.h> #include <ethernet.h> #include <usb_ops.h> #include <wifi.h>
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -23,7 +23,6 @@#include <recv_osdep.h> #include <mlme_osdep.h> #include <ip.h> -#include <if_ether.h> #include <ethernet.h> #include <usb_ops.h>
drivers/staging/rtl8188eu/include/if_ether.h deleted +0 -111
111 lines not on this page · raw message
drivers/staging/rtl8188eu/os_dep/xmit_linux.c +0 -1
@@ -23,7 +23,6 @@#include <osdep_service.h> #include <drv_types.h> -#include <if_ether.h> #include <ip.h> #include <wifi.h> #include <mlme_osdep.h>
Signature · 1 line
1.7.10.4
PATCH 2/3 staging: rtl8188eu: remove header file ip.h
"ip.h" is included in four files but not being used, so remove "include/ip.h" header file and inclusion of this header file.
--- drivers/staging/rtl8188eu/core/rtw_recv.c | 1 - drivers/staging/rtl8188eu/core/rtw_xmit.c | 1 - drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/rtl8188eu/include/ip.h | 126 ------------------------ drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 1 - 5 files changed, 130 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/include/ip.h
drivers/staging/rtl8188eu/core/rtw_recv.c +0 -1
@@ -23,7 +23,6 @@#include <drv_types.h> #include <recv_osdep.h> #include <mlme_osdep.h> -#include <ip.h> #include <ethernet.h> #include <usb_ops.h> #include <wifi.h>
drivers/staging/rtl8188eu/core/rtw_xmit.c +0 -1
@@ -23,7 +23,6 @@#include <drv_types.h> #include <wifi.h> #include <osdep_intf.h> -#include <ip.h> #include <usb_ops.h> #include <usb_osintf.h>
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -22,7 +22,6 @@#include <drv_types.h> #include <recv_osdep.h> #include <mlme_osdep.h> -#include <ip.h> #include <ethernet.h> #include <usb_ops.h>
drivers/staging/rtl8188eu/include/ip.h deleted +0 -126
126 lines not on this page · raw message
drivers/staging/rtl8188eu/os_dep/xmit_linux.c +0 -1
@@ -23,7 +23,6 @@#include <osdep_service.h> #include <drv_types.h> -#include <ip.h> #include <wifi.h> #include <mlme_osdep.h> #include <xmit_osdep.h>
Signature · 1 line
1.7.10.4
PATCH 3/3 staging: rtl8188eu: remove header file ethernet.h
In reply to navin patidar"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.
--- 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
@@ -23,10 +23,12 @@#include <drv_types.h> #include <recv_osdep.h> #include <mlme_osdep.h> -#include <ethernet.h> #include <usb_ops.h> #include <wifi.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
@@ -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
@@ -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
Greg KH
maintainerRe: [PATCH 3/3] staging: rtl8188eu: remove header file ethernet.h
Quoted 4 lines · navin patidar
"
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.
Quoted 8 lines
Signed-off-by navin patidar <[email protected]>--- 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
This patch fails to apply (2/3 had fuzz, but I fixed that up), can you redo this against linux-next and resend it?
thanks,
greg k-h
Re: [PATCH 3/3] staging: rtl8188eu: remove header file ethernet.h
I've submitted second version of this patch.
regards,
--navin-patidar
Quoted 20 lines · Greg KH
Quoted 4 lines · navin patidar
"
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.Quoted 8 lines
Signed-off-by navin patidar <[email protected]>--- 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.hThis patch fails to apply (2/3 had fuzz, but I fixed that up), can you redo this against linux-next and resend it?
thanks,
greg k-h