* [PATCH] staging: r8188eu: remove ip.h header file
@ 2021-08-23 8:18 Michael Straube
2021-08-23 22:21 ` Phillip Potter
0 siblings, 1 reply; 4+ messages in thread
From: Michael Straube @ 2021-08-23 8:18 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, martin, fmdefrancesco, linux-staging,
linux-kernel, Michael Straube
The struct ip_options declared in ip.h is only unsed in the optlength
macro which is also defined in ip.h. All other definitions/declarations
in ip.h are duplicated from <include/uapi/linux/ip.h>. Remove the ip.h
header file and its includes.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
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
diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index 52236bae8693..8802f24fec3a 100644
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -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/if_ether.h"
#include "../include/ethernet.h"
#include "../include/usb_ops.h"
diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index f242f3ffca70..38183fd37b93 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -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"
diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
index a44c9598186c..216a752e6246 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
@@ -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/if_ether.h"
#include "../include/ethernet.h"
diff --git a/drivers/staging/r8188eu/include/ip.h b/drivers/staging/r8188eu/include/ip.h
deleted file mode 100644
index b7388c8c1b8a..000000000000
--- a/drivers/staging/r8188eu/include/ip.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
-/* Copyright(c) 2007 - 2011 Realtek Corporation. */
-
-#ifndef _LINUX_IP_H
-#define _LINUX_IP_H
-
-/* SOL_IP socket options */
-
-#define IPTOS_TOS_MASK 0x1E
-#define IPTOS_TOS(tos) ((tos)&IPTOS_TOS_MASK)
-#define IPTOS_LOWDELAY 0x10
-#define IPTOS_THROUGHPUT 0x08
-#define IPTOS_RELIABILITY 0x04
-#define IPTOS_MINCOST 0x02
-
-#define IPTOS_PREC_MASK 0xE0
-#define IPTOS_PREC(tos) ((tos)&IPTOS_PREC_MASK)
-#define IPTOS_PREC_NETCONTROL 0xe0
-#define IPTOS_PREC_INTERNETCONTROL 0xc0
-#define IPTOS_PREC_CRITIC_ECP 0xa0
-#define IPTOS_PREC_FLASHOVERRIDE 0x80
-#define IPTOS_PREC_FLASH 0x60
-#define IPTOS_PREC_IMMEDIATE 0x40
-#define IPTOS_PREC_PRIORITY 0x20
-#define IPTOS_PREC_ROUTINE 0x00
-
-/* IP options */
-#define IPOPT_COPY 0x80
-#define IPOPT_CLASS_MASK 0x60
-#define IPOPT_NUMBER_MASK 0x1f
-
-#define IPOPT_COPIED(o) ((o)&IPOPT_COPY)
-#define IPOPT_CLASS(o) ((o)&IPOPT_CLASS_MASK)
-#define IPOPT_NUMBER(o) ((o)&IPOPT_NUMBER_MASK)
-
-#define IPOPT_CONTROL 0x00
-#define IPOPT_RESERVED1 0x20
-#define IPOPT_MEASUREMENT 0x40
-#define IPOPT_RESERVED2 0x60
-
-#define IPOPT_END (0 | IPOPT_CONTROL)
-#define IPOPT_NOOP (1 | IPOPT_CONTROL)
-#define IPOPT_SEC (2 | IPOPT_CONTROL | IPOPT_COPY)
-#define IPOPT_LSRR (3 | IPOPT_CONTROL | IPOPT_COPY)
-#define IPOPT_TIMESTAMP (4 | IPOPT_MEASUREMENT)
-#define IPOPT_RR (7 | IPOPT_CONTROL)
-#define IPOPT_SID (8 | IPOPT_CONTROL | IPOPT_COPY)
-#define IPOPT_SSRR (9 | IPOPT_CONTROL | IPOPT_COPY)
-#define IPOPT_RA (20 | IPOPT_CONTROL | IPOPT_COPY)
-
-#define IPVERSION 4
-#define MAXTTL 255
-#define IPDEFTTL 64
-#define IPOPT_OPTVAL 0
-#define IPOPT_OLEN 1
-#define IPOPT_OFFSET 2
-#define IPOPT_MINOFF 4
-#define MAX_IPOPTLEN 40
-#define IPOPT_NOP IPOPT_NOOP
-#define IPOPT_EOL IPOPT_END
-#define IPOPT_TS IPOPT_TIMESTAMP
-
-#define IPOPT_TS_TSONLY 0 /* timestamps only */
-#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */
-#define IPOPT_TS_PRESPEC 3 /* specified modules only */
-
-struct ip_options {
- __u32 faddr; /* Saved first hop address */
- unsigned char optlen;
- unsigned char srr;
- unsigned char rr;
- unsigned char ts;
- unsigned char is_setbyuser:1, /* Set by setsockopt? */
- is_data:1, /* Options in __data, rather than skb*/
- is_strictroute:1,/* Strict source route */
- srr_is_hit:1, /* Packet destn addr was ours */
- is_changed:1, /* IP checksum more not valid */
- rr_needaddr:1, /* Need to record addr of out dev*/
- ts_needtime:1, /* Need to record timestamp */
- ts_needaddr:1; /* Need to record addr of out dev */
- unsigned char router_alert;
- unsigned char __pad1;
- unsigned char __pad2;
- unsigned char __data[0];
-};
-
-#define optlength(opt) (sizeof(struct ip_options) + opt->optlen)
-
-struct iphdr {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
- __u8 ihl:4,
- version:4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
- __u8 version:4,
- ihl:4;
-#endif
- __u8 tos;
- __u16 tot_len;
- __u16 id;
- __u16 frag_off;
- __u8 ttl;
- __u8 protocol;
- __u16 check;
- __u32 saddr;
- __u32 daddr;
- /*The options start here. */
-};
-
-#endif /* _LINUX_IP_H */
diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/r8188eu/os_dep/xmit_linux.c
index 60e0eea7ad84..80546a886c0e 100644
--- a/drivers/staging/r8188eu/os_dep/xmit_linux.c
+++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c
@@ -6,7 +6,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"
#include "../include/xmit_osdep.h"
--
2.32.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: r8188eu: remove ip.h header file
2021-08-23 8:18 [PATCH] staging: r8188eu: remove ip.h header file Michael Straube
@ 2021-08-23 22:21 ` Phillip Potter
2021-08-23 22:31 ` Michael Straube
0 siblings, 1 reply; 4+ messages in thread
From: Phillip Potter @ 2021-08-23 22:21 UTC (permalink / raw)
To: Michael Straube
Cc: Greg KH, Larry Finger, Martin Kaiser, Fabio M. De Francesco,
open list:STAGING SUBSYSTEM, Linux Kernel Mailing List
On Mon, 23 Aug 2021 at 09:19, Michael Straube <straube.linux@gmail.com> wrote:
>
> The struct ip_options declared in ip.h is only unsed in the optlength
> macro which is also defined in ip.h. All other definitions/declarations
> in ip.h are duplicated from <include/uapi/linux/ip.h>. Remove the ip.h
> header file and its includes.
>
> Signed-off-by: Michael Straube <straube.linux@gmail.com>
> ---
> 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
>
> diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
> index 52236bae8693..8802f24fec3a 100644
> --- a/drivers/staging/r8188eu/core/rtw_recv.c
> +++ b/drivers/staging/r8188eu/core/rtw_recv.c
> @@ -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/if_ether.h"
> #include "../include/ethernet.h"
> #include "../include/usb_ops.h"
> diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
> index f242f3ffca70..38183fd37b93 100644
> --- a/drivers/staging/r8188eu/core/rtw_xmit.c
> +++ b/drivers/staging/r8188eu/core/rtw_xmit.c
> @@ -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"
>
> diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
> index a44c9598186c..216a752e6246 100644
> --- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
> +++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
> @@ -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/if_ether.h"
> #include "../include/ethernet.h"
>
> diff --git a/drivers/staging/r8188eu/include/ip.h b/drivers/staging/r8188eu/include/ip.h
> deleted file mode 100644
> index b7388c8c1b8a..000000000000
> --- a/drivers/staging/r8188eu/include/ip.h
> +++ /dev/null
> @@ -1,109 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
> -/* Copyright(c) 2007 - 2011 Realtek Corporation. */
> -
> -#ifndef _LINUX_IP_H
> -#define _LINUX_IP_H
> -
> -/* SOL_IP socket options */
> -
> -#define IPTOS_TOS_MASK 0x1E
> -#define IPTOS_TOS(tos) ((tos)&IPTOS_TOS_MASK)
> -#define IPTOS_LOWDELAY 0x10
> -#define IPTOS_THROUGHPUT 0x08
> -#define IPTOS_RELIABILITY 0x04
> -#define IPTOS_MINCOST 0x02
> -
> -#define IPTOS_PREC_MASK 0xE0
> -#define IPTOS_PREC(tos) ((tos)&IPTOS_PREC_MASK)
> -#define IPTOS_PREC_NETCONTROL 0xe0
> -#define IPTOS_PREC_INTERNETCONTROL 0xc0
> -#define IPTOS_PREC_CRITIC_ECP 0xa0
> -#define IPTOS_PREC_FLASHOVERRIDE 0x80
> -#define IPTOS_PREC_FLASH 0x60
> -#define IPTOS_PREC_IMMEDIATE 0x40
> -#define IPTOS_PREC_PRIORITY 0x20
> -#define IPTOS_PREC_ROUTINE 0x00
> -
> -/* IP options */
> -#define IPOPT_COPY 0x80
> -#define IPOPT_CLASS_MASK 0x60
> -#define IPOPT_NUMBER_MASK 0x1f
> -
> -#define IPOPT_COPIED(o) ((o)&IPOPT_COPY)
> -#define IPOPT_CLASS(o) ((o)&IPOPT_CLASS_MASK)
> -#define IPOPT_NUMBER(o) ((o)&IPOPT_NUMBER_MASK)
> -
> -#define IPOPT_CONTROL 0x00
> -#define IPOPT_RESERVED1 0x20
> -#define IPOPT_MEASUREMENT 0x40
> -#define IPOPT_RESERVED2 0x60
> -
> -#define IPOPT_END (0 | IPOPT_CONTROL)
> -#define IPOPT_NOOP (1 | IPOPT_CONTROL)
> -#define IPOPT_SEC (2 | IPOPT_CONTROL | IPOPT_COPY)
> -#define IPOPT_LSRR (3 | IPOPT_CONTROL | IPOPT_COPY)
> -#define IPOPT_TIMESTAMP (4 | IPOPT_MEASUREMENT)
> -#define IPOPT_RR (7 | IPOPT_CONTROL)
> -#define IPOPT_SID (8 | IPOPT_CONTROL | IPOPT_COPY)
> -#define IPOPT_SSRR (9 | IPOPT_CONTROL | IPOPT_COPY)
> -#define IPOPT_RA (20 | IPOPT_CONTROL | IPOPT_COPY)
> -
> -#define IPVERSION 4
> -#define MAXTTL 255
> -#define IPDEFTTL 64
> -#define IPOPT_OPTVAL 0
> -#define IPOPT_OLEN 1
> -#define IPOPT_OFFSET 2
> -#define IPOPT_MINOFF 4
> -#define MAX_IPOPTLEN 40
> -#define IPOPT_NOP IPOPT_NOOP
> -#define IPOPT_EOL IPOPT_END
> -#define IPOPT_TS IPOPT_TIMESTAMP
> -
> -#define IPOPT_TS_TSONLY 0 /* timestamps only */
> -#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */
> -#define IPOPT_TS_PRESPEC 3 /* specified modules only */
> -
> -struct ip_options {
> - __u32 faddr; /* Saved first hop address */
> - unsigned char optlen;
> - unsigned char srr;
> - unsigned char rr;
> - unsigned char ts;
> - unsigned char is_setbyuser:1, /* Set by setsockopt? */
> - is_data:1, /* Options in __data, rather than skb*/
> - is_strictroute:1,/* Strict source route */
> - srr_is_hit:1, /* Packet destn addr was ours */
> - is_changed:1, /* IP checksum more not valid */
> - rr_needaddr:1, /* Need to record addr of out dev*/
> - ts_needtime:1, /* Need to record timestamp */
> - ts_needaddr:1; /* Need to record addr of out dev */
> - unsigned char router_alert;
> - unsigned char __pad1;
> - unsigned char __pad2;
> - unsigned char __data[0];
> -};
> -
> -#define optlength(opt) (sizeof(struct ip_options) + opt->optlen)
> -
> -struct iphdr {
> -#if defined(__LITTLE_ENDIAN_BITFIELD)
> - __u8 ihl:4,
> - version:4;
> -#elif defined(__BIG_ENDIAN_BITFIELD)
> - __u8 version:4,
> - ihl:4;
> -#endif
> - __u8 tos;
> - __u16 tot_len;
> - __u16 id;
> - __u16 frag_off;
> - __u8 ttl;
> - __u8 protocol;
> - __u16 check;
> - __u32 saddr;
> - __u32 daddr;
> - /*The options start here. */
> -};
> -
> -#endif /* _LINUX_IP_H */
> diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/r8188eu/os_dep/xmit_linux.c
> index 60e0eea7ad84..80546a886c0e 100644
> --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c
> +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c
> @@ -6,7 +6,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"
> #include "../include/xmit_osdep.h"
> --
> 2.32.0
>
Dear Michael,
Thanks for the patch. Sorry, but it seems to conflict with your
earlier patch titled: "[PATCH] staging: r8188eu: remove if_ether.h
header file". They apply fine individually, but not together - can you
confirm this is the case for you as well and not just me?
Regards,
Phil
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: r8188eu: remove ip.h header file
2021-08-23 22:21 ` Phillip Potter
@ 2021-08-23 22:31 ` Michael Straube
2021-08-23 22:38 ` Phillip Potter
0 siblings, 1 reply; 4+ messages in thread
From: Michael Straube @ 2021-08-23 22:31 UTC (permalink / raw)
To: Phillip Potter
Cc: Greg KH, Larry Finger, Martin Kaiser, Fabio M. De Francesco,
open list:STAGING SUBSYSTEM, Linux Kernel Mailing List
On 8/24/21 12:21 AM, Phillip Potter wrote:
> On Mon, 23 Aug 2021 at 09:19, Michael Straube <straube.linux@gmail.com> wrote:
>>
>> The struct ip_options declared in ip.h is only unsed in the optlength
>> macro which is also defined in ip.h. All other definitions/declarations
>> in ip.h are duplicated from <include/uapi/linux/ip.h>. Remove the ip.h
>> header file and its includes.
>>
>> Signed-off-by: Michael Straube <straube.linux@gmail.com>
>> ---
>
> Dear Michael,
>
> Thanks for the patch. Sorry, but it seems to conflict with your
> earlier patch titled: "[PATCH] staging: r8188eu: remove if_ether.h
> header file". They apply fine individually, but not together - can you
> confirm this is the case for you as well and not just me?
>
> Regards,
> Phil
>
Hi Phillip,
yes I can confirm, sorry about that. I will rework and send both patches
in a series. Thank you for testing and pointing out this conflict.
best regards,
Michael
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: r8188eu: remove ip.h header file
2021-08-23 22:31 ` Michael Straube
@ 2021-08-23 22:38 ` Phillip Potter
0 siblings, 0 replies; 4+ messages in thread
From: Phillip Potter @ 2021-08-23 22:38 UTC (permalink / raw)
To: Michael Straube
Cc: Greg KH, Larry Finger, Martin Kaiser, Fabio M. De Francesco,
open list:STAGING SUBSYSTEM, Linux Kernel Mailing List
On Mon, 23 Aug 2021 at 23:32, Michael Straube <straube.linux@gmail.com> wrote:
>
> On 8/24/21 12:21 AM, Phillip Potter wrote:
> > On Mon, 23 Aug 2021 at 09:19, Michael Straube <straube.linux@gmail.com> wrote:
> >>
> >> The struct ip_options declared in ip.h is only unsed in the optlength
> >> macro which is also defined in ip.h. All other definitions/declarations
> >> in ip.h are duplicated from <include/uapi/linux/ip.h>. Remove the ip.h
> >> header file and its includes.
> >>
> >> Signed-off-by: Michael Straube <straube.linux@gmail.com>
> >> ---
>
> >
> > Dear Michael,
> >
> > Thanks for the patch. Sorry, but it seems to conflict with your
> > earlier patch titled: "[PATCH] staging: r8188eu: remove if_ether.h
> > header file". They apply fine individually, but not together - can you
> > confirm this is the case for you as well and not just me?
> >
> > Regards,
> > Phil
> >
>
> Hi Phillip,
>
> yes I can confirm, sorry about that. I will rework and send both patches
> in a series. Thank you for testing and pointing out this conflict.
>
> best regards,
> Michael
No apology necessary, and thanks again for the patches.
Regards,
Phil
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-23 22:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-23 8:18 [PATCH] staging: r8188eu: remove ip.h header file Michael Straube
2021-08-23 22:21 ` Phillip Potter
2021-08-23 22:31 ` Michael Straube
2021-08-23 22:38 ` Phillip Potter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).