2021-08-16 07:55:45

by Cai,Huoqing

Subject: [PATCH] staging: r8188eu: Remove the dependency on ipx.h

commit <47595e32869f> ("<MAINTAINERS: Mark some staging directories>")
indicated the ipx network layer as obsolete in Jan 2018,
updated in the MAINTAINERS file

now, after being exposed for 3 years to refactoring,
so to remove the dependency on ipx.h

Signed-off-by: Cai Huoqing <[email protected]>
---
drivers/staging/r8188eu/core/rtw_br_ext.c | 24 ++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c
index 63a4cabdd3a8..173679709e70 100644
--- a/drivers/staging/r8188eu/core/rtw_br_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_br_ext.c
@@ -5,7 +5,6 @@

#include "../include/linux/if_arp.h"
#include "../include/net/ip.h"
-#include "../include/net/ipx.h"
#include "../include/linux/atalk.h"
#include "../include/linux/udp.h"
#include "../include/linux/if_pppox.h"
@@ -37,6 +36,29 @@
#define MAGIC_CODE_LEN 2
#define WAIT_TIME_PPPOE 5 /* waiting time for pppoe server in sec */

+#define IPX_NODE_LEN 6
+struct ipx_address {
+ __be32 net;
+ __u8 node[IPX_NODE_LEN];
+ __be16 sock;
+};
+
+struct ipxhdr {
+ __be16 ipx_checksum __packed;
+#define IPX_NO_CHECKSUM cpu_to_be16(0xFFFF)
+ __be16 ipx_pktsize __packed;
+ __u8 ipx_tctrl;
+ __u8 ipx_type;
+#define IPX_TYPE_UNKNOWN 0x00
+#define IPX_TYPE_RIP 0x01 /* may also be 0 */
+#define IPX_TYPE_SAP 0x04 /* may also be 0 */
+#define IPX_TYPE_SPX 0x05 /* SPX protocol */
+#define IPX_TYPE_NCP 0x11 /* $lots for docs on this (SPIT) */
+#define IPX_TYPE_PPROP 0x14 /* complicated flood fill brdcast */
+ struct ipx_address ipx_dest __packed;
+ struct ipx_address ipx_source __packed;
+};
+
/*-----------------------------------------------------------------
How database records network address:
0 1 2 3 4 5 6 7 8 9 10
--
2.25.1

2021-08-16 08:12:12

by Greg Kroah-Hartman

Subject: Re: [PATCH] staging: r8188eu: Remove the dependency on ipx.h

On Mon, Aug 16, 2021 at 03:54:06PM +0800, Cai Huoqing wrote:
> commit <47595e32869f> ("<MAINTAINERS: Mark some staging directories>")
> indicated the ipx network layer as obsolete in Jan 2018,
> updated in the MAINTAINERS file
>
> now, after being exposed for 3 years to refactoring,
> so to remove the dependency on ipx.h
>
> Signed-off-by: Cai Huoqing <[email protected]>
> ---
> drivers/staging/r8188eu/core/rtw_br_ext.c | 24 ++++++++++++++++++++++-
> 1 file changed, 23 insertions(+), 1 deletion(-)

See:
https://lore.kernel.org/r/[email protected]

for a different approach to this.

thanks,

greg k-h

2021-08-16 08:34:58

by Cai,Huoqing

Subject: Re: [PATCH] staging: r8188eu: Remove the dependency on ipx.h

On 16 Aug 21 10:10:23, Greg KH wrote:
> On Mon, Aug 16, 2021 at 03:54:06PM +0800, Cai Huoqing wrote:
> > commit <47595e32869f> ("<MAINTAINERS: Mark some staging directories>")
> > indicated the ipx network layer as obsolete in Jan 2018,
> > updated in the MAINTAINERS file
> >
> > now, after being exposed for 3 years to refactoring,
> > so to remove the dependency on ipx.h
> >
> > Signed-off-by: Cai Huoqing <[email protected]>
> > ---
> > drivers/staging/r8188eu/core/rtw_br_ext.c | 24 ++++++++++++++++++++++-
> > 1 file changed, 23 insertions(+), 1 deletion(-)
>
> See:
> https://lore.kernel.org/r/[email protected]
cool
>
> for a different approach to this.
>
> thanks,
>
> greg k-h
>