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/linux (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
14 14
15#include <linux/atmapi.h>15#include <linux/atmapi.h>
16#include <linux/atmioc.h>16#include <linux/atmioc.h>
17#include <linux/time.h>
17 18
18#define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)19#define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
19 /* get pool statistics */20 /* get pool statistics */
include/uapi/linux/if_pppol2tp.h+2−1
@@ -16,7 +16,8 @@ · 15 unmodified lines
16#define _UAPI__LINUX_IF_PPPOL2TP_H16#define _UAPI__LINUX_IF_PPPOL2TP_H
17 17
18#include <linux/types.h>18#include <linux/types.h>
19 19#include <linux/in.h>
20#include <linux/in6.h>
20 21
21/* Structure used to connect() the socket to a particular tunnel UDP22/* Structure used to connect() the socket to a particular tunnel UDP
22 * socket over IPv4.23 * socket over IPv4.
include/uapi/linux/if_pppox.h+3−0
@@ -21,8 +21,11 @@ · 20 unmodified lines
21#include <asm/byteorder.h>21#include <asm/byteorder.h>
22 22
23#include <linux/socket.h>23#include <linux/socket.h>
24#include <linux/if.h>
24#include <linux/if_ether.h>25#include <linux/if_ether.h>
25#include <linux/if_pppol2tp.h>26#include <linux/if_pppol2tp.h>
27#include <linux/in.h>
28#include <linux/in6.h>
26 29
27/* For user-space programs to pick up these definitions30/* For user-space programs to pick up these definitions
28 * which they wouldn't get otherwise without defining __KERNEL__31 * which they wouldn't get otherwise without defining __KERNEL__
include/uapi/linux/if_tunnel.h+3−0
@@ -2,6 +2,9 @@ · 1 unmodified line
2#define _UAPI_IF_TUNNEL_H_2#define _UAPI_IF_TUNNEL_H_
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/if.h>
6#include <linux/ip.h>
7#include <linux/in6.h>
5#include <asm/byteorder.h>8#include <asm/byteorder.h>
6 9
7 10
include/uapi/linux/ipx.h+12−1
@@ -1,11 +1,13 @@
1#ifndef _IPX_H_1#ifndef _IPX_H_
2#define _IPX_H_2#define _IPX_H_
3#include <linux/libc-compat.h> /* for compatibility with glibc netipx/ipx.h */
3#include <linux/types.h>4#include <linux/types.h>
4#include <linux/sockios.h>5#include <linux/sockios.h>
5#include <linux/socket.h>6#include <linux/socket.h>
6#define IPX_NODE_LEN 67#define IPX_NODE_LEN 6
7#define IPX_MTU 5768#define IPX_MTU 576
8 9
10#if __UAPI_DEF_SOCKADDR_IPX
9struct sockaddr_ipx {11struct sockaddr_ipx {
10 __kernel_sa_family_t sipx_family;12 __kernel_sa_family_t sipx_family;
11 __be16 sipx_port;13 __be16 sipx_port;
@@ -14,6 +16,7 @@ struct sockaddr_ipx { · 2 unmodified lines
14 __u8 sipx_type;16 __u8 sipx_type;
15 unsigned char sipx_zero; /* 16 byte fill */17 unsigned char sipx_zero; /* 16 byte fill */
16};18};
19#endif /* __UAPI_DEF_SOCKADDR_IPX */
17 20
18/*21/*
19 * So we can fit the extra info for SIOCSIFADDR into the address nicely22 * So we can fit the extra info for SIOCSIFADDR into the address nicely
@@ -23,12 +26,15 @@ struct sockaddr_ipx { · 3 unmodified lines
23#define IPX_DLTITF 026#define IPX_DLTITF 0
24#define IPX_CRTITF 127#define IPX_CRTITF 1
25 28
29#if __UAPI_DEF_IPX_ROUTE_DEFINITION
26struct ipx_route_definition {30struct ipx_route_definition {
27 __be32 ipx_network;31 __be32 ipx_network;
28 __be32 ipx_router_network;32 __be32 ipx_router_network;
29 unsigned char ipx_router_node[IPX_NODE_LEN];33 unsigned char ipx_router_node[IPX_NODE_LEN];
30};34};
35#endif /* __UAPI_DEF_IPX_ROUTE_DEFINITION */
31 36
37#if __UAPI_DEF_IPX_INTERFACE_DEFINITION
32struct ipx_interface_definition {38struct ipx_interface_definition {
33 __be32 ipx_network;39 __be32 ipx_network;
34 unsigned char ipx_device[16];40 unsigned char ipx_device[16];
@@ -45,16 +51,20 @@ struct ipx_interface_definition { · 10 unmodified lines
45#define IPX_INTERNAL 251#define IPX_INTERNAL 2
46 unsigned char ipx_node[IPX_NODE_LEN];52 unsigned char ipx_node[IPX_NODE_LEN];
47};53};
48 54#endif /* __UAPI_DEF_IPX_INTERFACE_DEFINITION */
55
56#if __UAPI_DEF_IPX_CONFIG_DATA
49struct ipx_config_data {57struct ipx_config_data {
50 unsigned char ipxcfg_auto_select_primary;58 unsigned char ipxcfg_auto_select_primary;
51 unsigned char ipxcfg_auto_create_interfaces;59 unsigned char ipxcfg_auto_create_interfaces;
52};60};
61#endif /* __UAPI_DEF_IPX_CONFIG_DATA */
53 62
54/*63/*
55 * OLD Route Definition for backward compatibility.64 * OLD Route Definition for backward compatibility.
56 */65 */
57 66
67#if __UAPI_DEF_IPX_ROUTE_DEF
58struct ipx_route_def {68struct ipx_route_def {
59 __be32 ipx_network;69 __be32 ipx_network;
60 __be32 ipx_router_network;70 __be32 ipx_router_network;
@@ -67,6 +77,7 @@ struct ipx_route_def { · 6 unmodified lines
67#define IPX_RT_BLUEBOOK 277#define IPX_RT_BLUEBOOK 2
68#define IPX_RT_ROUTED 178#define IPX_RT_ROUTED 1
69};79};
80#endif /* __UAPI_DEF_IPX_ROUTE_DEF */
70 81
71#define SIOCAIPXITFCRT (SIOCPROTOPRIVATE)82#define SIOCAIPXITFCRT (SIOCPROTOPRIVATE)
72#define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1)83#define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1)
include/uapi/linux/libc-compat.h+26−0
@@ -139,6 +139,25 @@ · 138 unmodified lines
139 139
140#endif /* _NETINET_IN_H */140#endif /* _NETINET_IN_H */
141 141
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
142/* Definitions for xattr.h */161/* Definitions for xattr.h */
143#if defined(_SYS_XATTR_H)162#if defined(_SYS_XATTR_H)
144#define __UAPI_DEF_XATTR 0163#define __UAPI_DEF_XATTR 0
@@ -179,6 +198,13 @@ · 34 unmodified lines
179#define __UAPI_DEF_IN6_PKTINFO 1198#define __UAPI_DEF_IN6_PKTINFO 1
180#define __UAPI_DEF_IP6_MTUINFO 1199#define __UAPI_DEF_IP6_MTUINFO 1
181 200
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
182/* Definitions for xattr.h */208/* Definitions for xattr.h */
183#define __UAPI_DEF_XATTR 1209#define __UAPI_DEF_XATTR 1
184 210
include/uapi/linux/openvswitch.h+3−3
@@ -583,7 +583,7 @@ enum ovs_userspace_attr { · 582 unmodified lines
583#define OVS_USERSPACE_ATTR_MAX (__OVS_USERSPACE_ATTR_MAX - 1)583#define OVS_USERSPACE_ATTR_MAX (__OVS_USERSPACE_ATTR_MAX - 1)
584 584
585struct ovs_action_trunc {585struct ovs_action_trunc {
586 uint32_t max_len; /* Max packet size in bytes. */586 __u32 max_len; /* Max packet size in bytes. */
587};587};
588 588
589/**589/**
@@ -632,8 +632,8 @@ enum ovs_hash_alg { · 42 unmodified lines
632 * @hash_basis: basis used for computing hash.632 * @hash_basis: basis used for computing hash.
633 */633 */
634struct ovs_action_hash {634struct ovs_action_hash {
635 uint32_t hash_alg; /* One of ovs_hash_alg. */635 __u32 hash_alg; /* One of ovs_hash_alg. */
636 uint32_t hash_basis;636 __u32 hash_basis;
637};637};
638 638
639/**639/**

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