Skip to content

Commit 3583528

Browse files
committed
Fix compilation for Linux 6.12+
Define ipx structures in "linux/ipx.h" unconditionally.
1 parent 5ef5cba commit 3583528

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

linux/ipx.h

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22
#ifndef _IPX_H_
33
#define _IPX_H_
4-
#include <linux/libc-compat.h> /* for compatibility with glibc netipx/ipx.h */
4+
55
#include <linux/types.h>
66
#include <linux/sockios.h>
77
#include <linux/socket.h>
8+
89
#define IPX_NODE_LEN 6
910
#define IPX_MTU 576
1011

11-
#if __UAPI_DEF_SOCKADDR_IPX
1212
struct sockaddr_ipx {
1313
__kernel_sa_family_t sipx_family;
1414
__be16 sipx_port;
@@ -17,7 +17,6 @@ struct sockaddr_ipx {
1717
__u8 sipx_type;
1818
unsigned char sipx_zero; /* 16 byte fill */
1919
};
20-
#endif /* __UAPI_DEF_SOCKADDR_IPX */
2120

2221
/*
2322
* So we can fit the extra info for SIOCSIFADDR into the address nicely
@@ -27,15 +26,12 @@ struct sockaddr_ipx {
2726
#define IPX_DLTITF 0
2827
#define IPX_CRTITF 1
2928

30-
#if __UAPI_DEF_IPX_ROUTE_DEFINITION
3129
struct ipx_route_definition {
3230
__be32 ipx_network;
3331
__be32 ipx_router_network;
3432
unsigned char ipx_router_node[IPX_NODE_LEN];
3533
};
36-
#endif /* __UAPI_DEF_IPX_ROUTE_DEFINITION */
3734

38-
#if __UAPI_DEF_IPX_INTERFACE_DEFINITION
3935
struct ipx_interface_definition {
4036
__be32 ipx_network;
4137
unsigned char ipx_device[16];
@@ -52,20 +48,16 @@ struct ipx_interface_definition {
5248
#define IPX_INTERNAL 2
5349
unsigned char ipx_node[IPX_NODE_LEN];
5450
};
55-
#endif /* __UAPI_DEF_IPX_INTERFACE_DEFINITION */
5651

57-
#if __UAPI_DEF_IPX_CONFIG_DATA
5852
struct ipx_config_data {
5953
unsigned char ipxcfg_auto_select_primary;
6054
unsigned char ipxcfg_auto_create_interfaces;
6155
};
62-
#endif /* __UAPI_DEF_IPX_CONFIG_DATA */
6356

6457
/*
6558
* OLD Route Definition for backward compatibility.
6659
*/
6760

68-
#if __UAPI_DEF_IPX_ROUTE_DEF
6961
struct ipx_route_def {
7062
__be32 ipx_network;
7163
__be32 ipx_router_network;
@@ -78,7 +70,6 @@ struct ipx_route_def {
7870
#define IPX_RT_BLUEBOOK 2
7971
#define IPX_RT_ROUTED 1
8072
};
81-
#endif /* __UAPI_DEF_IPX_ROUTE_DEF */
8273

8374
#define SIOCAIPXITFCRT (SIOCPROTOPRIVATE)
8475
#define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1)

0 commit comments

Comments
 (0)