Skip to contentSkip to conversation

staging: r8188eu: remove unneeded header files

PATCH Superseded Michael Straube 2 participants 4 messages Aug 23, 2021 – Aug 24, 2021 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover staging: r8188eu: remove unneeded header files

This series removes the header files if_ether.h and ip.h as both just duplicate in-kernel definitions.

Both patches were already sent as single patches but only the one or the other can be applied due to conflicts, so I resend them in this series.

Michael Straube (2):
staging: r8188eu: remove if_ether.h header file
staging: r8188eu: remove ip.h header file

 drivers/staging/r8188eu/core/rtw_recv.c      |   2 -
 drivers/staging/r8188eu/core/rtw_xmit.c      |   1 -
 drivers/staging/r8188eu/hal/rtl8188eu_recv.c |   2 -
 drivers/staging/r8188eu/include/if_ether.h   |  94 ----------------
 drivers/staging/r8188eu/include/ip.h         | 109 -------------------
 drivers/staging/r8188eu/os_dep/xmit_linux.c  |   2 -
 6 files changed, 210 deletions(-)
 delete mode 100644 drivers/staging/r8188eu/include/if_ether.h
 delete mode 100644 drivers/staging/r8188eu/include/ip.h
Signature · 1 line
2.32.0
#1 lore raw

PATCH 1/2 staging: r8188eu: remove if_ether.h header file

All constants, declarations and macros in if_ether.h are either duplicated from <uapi/linux/if_ether.h> or unused. Remove the file if_ether.h and its includes.

---
 drivers/staging/r8188eu/core/rtw_recv.c      |  1 -
 drivers/staging/r8188eu/hal/rtl8188eu_recv.c |  1 -
 drivers/staging/r8188eu/include/if_ether.h   | 94 --------------------
 drivers/staging/r8188eu/os_dep/xmit_linux.c  |  1 -
 4 files changed, 97 deletions(-)
 delete mode 100644 drivers/staging/r8188eu/include/if_ether.h
drivers/staging/r8188eu/core/rtw_recv.c +0 -1
index 52236bae8693..08066c9587f9 100644
@@ -8,7 +8,6 @@
 #include "../include/recv_osdep.h"
 #include "../include/mlme_osdep.h"
 #include "../include/ip.h"
-#include "../include/if_ether.h"
 #include "../include/ethernet.h"
 #include "../include/usb_ops.h"
 #include "../include/wifi.h"
drivers/staging/r8188eu/hal/rtl8188eu_recv.c +0 -1
index a44c9598186c..3a2c7090cd7b 100644
@@ -7,7 +7,6 @@
 #include "../include/recv_osdep.h"
 #include "../include/mlme_osdep.h"
 #include "../include/ip.h"
-#include "../include/if_ether.h"
 #include "../include/ethernet.h"
 
 #include "../include/usb_ops.h"
drivers/staging/r8188eu/include/if_ether.h deleted +0 -94

94 lines not on this page · raw message

drivers/staging/r8188eu/os_dep/xmit_linux.c +0 -1
index 60e0eea7ad84..d35e92c17a5e 100644
@@ -5,7 +5,6 @@
 
 #include "../include/osdep_service.h"
 #include "../include/drv_types.h"
-#include "../include/if_ether.h"
 #include "../include/ip.h"
 #include "../include/wifi.h"
 #include "../include/mlme_osdep.h"
Signature · 1 line
2.32.0
#2 lore raw

PATCH 2/2 staging: r8188eu: remove ip.h header file

In reply to Michael Straube

The struct ip_options declared in ip.h is only unsed in the optlength macro which is also defined in ip.h and not used in the driver code. All other definitions/declarations in ip.h are duplicated from <include/uapi/linux/ip.h>. Remove the ip.h header file and its includes.

---
 drivers/staging/r8188eu/core/rtw_recv.c      |   1 -
 drivers/staging/r8188eu/core/rtw_xmit.c      |   1 -
 drivers/staging/r8188eu/hal/rtl8188eu_recv.c |   1 -
 drivers/staging/r8188eu/include/ip.h         | 109 -------------------
 drivers/staging/r8188eu/os_dep/xmit_linux.c  |   1 -
 5 files changed, 113 deletions(-)
 delete mode 100644 drivers/staging/r8188eu/include/ip.h
drivers/staging/r8188eu/core/rtw_recv.c +0 -1
index 08066c9587f9..ea42b4954067 100644
@@ -7,7 +7,6 @@
 #include "../include/drv_types.h"
 #include "../include/recv_osdep.h"
 #include "../include/mlme_osdep.h"
-#include "../include/ip.h"
 #include "../include/ethernet.h"
 #include "../include/usb_ops.h"
 #include "../include/wifi.h"
drivers/staging/r8188eu/core/rtw_xmit.c +0 -1
index f242f3ffca70..38183fd37b93 100644
@@ -7,7 +7,6 @@
 #include "../include/drv_types.h"
 #include "../include/wifi.h"
 #include "../include/osdep_intf.h"
-#include "../include/ip.h"
 #include "../include/usb_ops.h"
 #include "../include/usb_osintf.h"
 
drivers/staging/r8188eu/hal/rtl8188eu_recv.c +0 -1
index 3a2c7090cd7b..666afa69fce6 100644
@@ -6,7 +6,6 @@
 #include "../include/drv_types.h"
 #include "../include/recv_osdep.h"
 #include "../include/mlme_osdep.h"
-#include "../include/ip.h"
 #include "../include/ethernet.h"
 
 #include "../include/usb_ops.h"
drivers/staging/r8188eu/include/ip.h deleted +0 -109

109 lines not on this page · raw message

drivers/staging/r8188eu/os_dep/xmit_linux.c +0 -1
index d35e92c17a5e..565ac5be7db3 100644
@@ -5,7 +5,6 @@
 
 #include "../include/osdep_service.h"
 #include "../include/drv_types.h"
-#include "../include/ip.h"
 #include "../include/wifi.h"
 #include "../include/mlme_osdep.h"
 #include "../include/xmit_osdep.h"
Signature · 1 line
2.32.0
Acked-by on the v1 series
#3 lore raw
In reply to Michael Straube
Quoted 22 lines · Michael Straube

This series removes the header files if_ether.h and ip.h as both just duplicate in-kernel definitions.

Both patches were already sent as single patches but only the one or the other can be applied due to conflicts, so I resend them in this series.

Michael Straube (2):
staging: r8188eu: remove if_ether.h header file
staging: r8188eu: remove ip.h header file

 drivers/staging/r8188eu/core/rtw_recv.c      |   2 -
 drivers/staging/r8188eu/core/rtw_xmit.c      |   1 -
 drivers/staging/r8188eu/hal/rtl8188eu_recv.c |   2 -
 drivers/staging/r8188eu/include/if_ether.h   |  94 ----------------
 drivers/staging/r8188eu/include/ip.h         | 109 -------------------
 drivers/staging/r8188eu/os_dep/xmit_linux.c  |   2 -
 6 files changed, 210 deletions(-)
 delete mode 100644 drivers/staging/r8188eu/include/if_ether.h
 delete mode 100644 drivers/staging/r8188eu/include/ip.h
Quoted 3 lines

--
2.32.0

Dear Michael,

Many thanks, applied/built/ran with both patches applied, looks good and works fine so far.

For both:

Regards,
Phil