History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

All three conflicts were cases of simple overlapping changes.

David S. Miller committed 10 years ago

Commit 6abdd5f2 parents 0b498a5 e4e98c4468 files · +5386 −2127Browse files

Showing the changes to include/uapi (7 of 468 files). Show all

Unified · Split

7 files
  1. include/uapi/linux/atm_zatm.h +1 −0
  2. include/uapi/linux/if_pppol2tp.h +2 −1
  3. include/uapi/linux/if_pppox.h +3 −0
  4. include/uapi/linux/if_tunnel.h +3 −0
  5. include/uapi/linux/ipx.h +12 −1
  6. include/uapi/linux/libc-compat.h +26 −0
  7. include/uapi/linux/openvswitch.h +3 −3
include/uapi/linux/atm_zatm.h+1−0
@@ -14,6 +14,7 @@ · 13 unmodified lines
1414
1515 #include <linux/atmapi.h>
1616 #include <linux/atmioc.h>
17+#include <linux/time.h>
1718
1819 #define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
1920 /* get pool statistics */
include/uapi/linux/if_pppol2tp.h+2−1
@@ -16,7 +16,8 @@ · 15 unmodified lines
1616 #define _UAPI__LINUX_IF_PPPOL2TP_H
1717
1818 #include <linux/types.h>
19−
19+#include <linux/in.h>
20+#include <linux/in6.h>
2021
2122 /* Structure used to connect() the socket to a particular tunnel UDP
2223 * socket over IPv4.
include/uapi/linux/if_pppox.h+3−0
@@ -21,8 +21,11 @@ · 20 unmodified lines
2121 #include <asm/byteorder.h>
2222
2323 #include <linux/socket.h>
24+#include <linux/if.h>
2425 #include <linux/if_ether.h>
2526 #include <linux/if_pppol2tp.h>
27+#include <linux/in.h>
28+#include <linux/in6.h>
2629
2730 /* For user-space programs to pick up these definitions
2831 * which they wouldn't get otherwise without defining __KERNEL__
include/uapi/linux/if_tunnel.h+3−0
@@ -2,6 +2,9 @@ · 1 unmodified line
22 #define _UAPI_IF_TUNNEL_H_
33
44 #include <linux/types.h>
5+#include <linux/if.h>
6+#include <linux/ip.h>
7+#include <linux/in6.h>
58 #include <asm/byteorder.h>
69
710
include/uapi/linux/ipx.h+12−1
@@ -1,11 +1,13 @@
11 #ifndef _IPX_H_
22 #define _IPX_H_
3+#include <linux/libc-compat.h> /* for compatibility with glibc netipx/ipx.h */
34 #include <linux/types.h>
45 #include <linux/sockios.h>
56 #include <linux/socket.h>
67 #define IPX_NODE_LEN 6
78 #define IPX_MTU 576
89
10+#if __UAPI_DEF_SOCKADDR_IPX
911 struct sockaddr_ipx {
1012 __kernel_sa_family_t sipx_family;
1113 __be16 sipx_port;
@@ -14,6 +16,7 @@ struct sockaddr_ipx { · 2 unmodified lines
1416 __u8 sipx_type;
1517 unsigned char sipx_zero; /* 16 byte fill */
1618 };
19+#endif /* __UAPI_DEF_SOCKADDR_IPX */
1720
1821 /*
1922 * So we can fit the extra info for SIOCSIFADDR into the address nicely
@@ -23,12 +26,15 @@ struct sockaddr_ipx { · 3 unmodified lines
2326 #define IPX_DLTITF 0
2427 #define IPX_CRTITF 1
2528
29+#if __UAPI_DEF_IPX_ROUTE_DEFINITION
2630 struct ipx_route_definition {
2731 __be32 ipx_network;
2832 __be32 ipx_router_network;
2933 unsigned char ipx_router_node[IPX_NODE_LEN];
3034 };
35+#endif /* __UAPI_DEF_IPX_ROUTE_DEFINITION */
3136
37+#if __UAPI_DEF_IPX_INTERFACE_DEFINITION
3238 struct ipx_interface_definition {
3339 __be32 ipx_network;
3440 unsigned char ipx_device[16];
@@ -45,16 +51,20 @@ struct ipx_interface_definition { · 10 unmodified lines
4551 #define IPX_INTERNAL 2
4652 unsigned char ipx_node[IPX_NODE_LEN];
4753 };
48−
54+#endif /* __UAPI_DEF_IPX_INTERFACE_DEFINITION */
55+
56+#if __UAPI_DEF_IPX_CONFIG_DATA
4957 struct ipx_config_data {
5058 unsigned char ipxcfg_auto_select_primary;
5159 unsigned char ipxcfg_auto_create_interfaces;
5260 };
61+#endif /* __UAPI_DEF_IPX_CONFIG_DATA */
5362
5463 /*
5564 * OLD Route Definition for backward compatibility.
5665 */
5766
67+#if __UAPI_DEF_IPX_ROUTE_DEF
5868 struct ipx_route_def {
5969 __be32 ipx_network;
6070 __be32 ipx_router_network;
@@ -67,6 +77,7 @@ struct ipx_route_def { · 6 unmodified lines
6777 #define IPX_RT_BLUEBOOK 2
6878 #define IPX_RT_ROUTED 1
6979 };
80+#endif /* __UAPI_DEF_IPX_ROUTE_DEF */
7081
7182 #define SIOCAIPXITFCRT (SIOCPROTOPRIVATE)
7283 #define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1)
include/uapi/linux/libc-compat.h+26−0
@@ -139,6 +139,25 @@ · 138 unmodified lines
139139
140140 #endif /* _NETINET_IN_H */
141141
142+/* Coordinate with glibc netipx/ipx.h header. */
143+#if defined(__NETIPX_IPX_H)
144+
145+#define __UAPI_DEF_SOCKADDR_IPX 0
146+#define __UAPI_DEF_IPX_ROUTE_DEFINITION 0
147+#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 0
148+#define __UAPI_DEF_IPX_CONFIG_DATA 0
149+#define __UAPI_DEF_IPX_ROUTE_DEF 0
150+
151+#else /* defined(__NETIPX_IPX_H) */
152+
153+#define __UAPI_DEF_SOCKADDR_IPX 1
154+#define __UAPI_DEF_IPX_ROUTE_DEFINITION 1
155+#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1
156+#define __UAPI_DEF_IPX_CONFIG_DATA 1
157+#define __UAPI_DEF_IPX_ROUTE_DEF 1
158+
159+#endif /* defined(__NETIPX_IPX_H) */
160+
142161 /* Definitions for xattr.h */
143162 #if defined(_SYS_XATTR_H)
144163 #define __UAPI_DEF_XATTR 0
@@ -179,6 +198,13 @@ · 34 unmodified lines
179198 #define __UAPI_DEF_IN6_PKTINFO 1
180199 #define __UAPI_DEF_IP6_MTUINFO 1
181200
201+/* Definitions for ipx.h */
202+#define __UAPI_DEF_SOCKADDR_IPX 1
203+#define __UAPI_DEF_IPX_ROUTE_DEFINITION 1
204+#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1
205+#define __UAPI_DEF_IPX_CONFIG_DATA 1
206+#define __UAPI_DEF_IPX_ROUTE_DEF 1
207+
182208 /* Definitions for xattr.h */
183209 #define __UAPI_DEF_XATTR 1
184210
include/uapi/linux/openvswitch.h+3−3
@@ -583,7 +583,7 @@ enum ovs_userspace_attr { · 582 unmodified lines
583583 #define OVS_USERSPACE_ATTR_MAX (__OVS_USERSPACE_ATTR_MAX - 1)
584584
585585 struct ovs_action_trunc {
586− uint32_t max_len; /* Max packet size in bytes. */
586+ __u32 max_len; /* Max packet size in bytes. */
587587 };
588588
589589 /**
@@ -632,8 +632,8 @@ enum ovs_hash_alg { · 42 unmodified lines
632632 * @hash_basis: basis used for computing hash.
633633 */
634634 struct ovs_action_hash {
635− uint32_t hash_alg; /* One of ovs_hash_alg. */
636− uint32_t hash_basis;
635+ __u32 hash_alg; /* One of ovs_hash_alg. */
636+ __u32 hash_basis;
637637 };
638638
639639 /**

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t