History

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

Pull networking fixes from David Miller: 1) Some 'const'ing in qlogic networking drivers, from Bhumika Goyal. 2) Fix scheduling while atomic in l2tp network namespace exit by deferring the work to the workqueue. From Ridge Kennedy. 3) Fix use after free in dccp timewait handling, from Andrey Ryabinin. 4) mlx5e CQE compression engine not initialized properly, from Tariq Toukan. 5) Some UAPI header fixes from Dmitry V. Levin. 6) Don't overwrite module parameter value in mlx4 driver, from Majd Dibbiny. 7) Fix divide by zero in xt_hashlimit netfilter module, from Alban Browaeys. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (35 commits) bpf: Fix bpf_xdp_event_output net/mlx4_en: Use __skb_fill_page_desc() net/mlx4_core: Use cq quota in SRIOV when creating completion EQs net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs net/mlx4: Spoofcheck and zero MAC can't coexist net/mlx4: Change ENOTSUPP to EOPNOTSUPP uapi: fix linux/rds.h userspace compilation errors uapi: fix linux/seg6.h and linux/seg6_iptunnel.h userspace compilation errors lib: Remove string from parman config selection forcedeth: Remove return from a void function bpf: fix spelling mistake: "proccessed" -> "processed" uapi: fix linux/llc.h userspace compilation error uapi: fix linux/ip6_tunnel.h userspace compilation errors net/mlx5e: Fix wrong CQE decompression net/mlx5e: Update MPWQE stride size when modifying CQE compress state net/mlx5e: Fix broken CQE compression initialization net/mlx5e: Do not reduce LRO WQE size when not using build_skb net/mlx5e: Register/unregister vport representors on interface attach/detach net/mlx5e: s390 system compilation fix tcp: account for ts offset only if tsecr not zero ...

Linus Torvalds committed 9 years ago

Commit 190c3ee2 parents af17fe7 9c4713747 files · +489 −133Browse files

Showing the changes to include/uapi/linux (8 of 47 files). Show all

Unified · Split

8 files
  1. include/uapi/linux/if.h +4 −0
  2. include/uapi/linux/ip6_tunnel.h +2 −0
  3. include/uapi/linux/llc.h +1 −0
  4. include/uapi/linux/netfilter/nf_conntrack_common.h +4 −0
  5. include/uapi/linux/netfilter/nfnetlink_queue.h +1 −1
  6. include/uapi/linux/rds.h +5 −5
  7. include/uapi/linux/seg6.h +1 −0
  8. include/uapi/linux/seg6_iptunnel.h +2 −0
include/uapi/linux/if.h+4−0
@@ -24,6 +24,10 @@ · 23 unmodified lines
24#include <linux/socket.h> /* for "struct sockaddr" et al */24#include <linux/socket.h> /* for "struct sockaddr" et al */
25#include <linux/compiler.h> /* for "__user" et al */25#include <linux/compiler.h> /* for "__user" et al */
26 26
27#ifndef __KERNEL__
28#include <sys/socket.h> /* for struct sockaddr. */
29#endif
30
27#if __UAPI_DEF_IF_IFNAMSIZ31#if __UAPI_DEF_IF_IFNAMSIZ
28#define IFNAMSIZ 1632#define IFNAMSIZ 16
29#endif /* __UAPI_DEF_IF_IFNAMSIZ */33#endif /* __UAPI_DEF_IF_IFNAMSIZ */
include/uapi/linux/ip6_tunnel.h+2−0
@@ -2,6 +2,8 @@ · 1 unmodified line
2#define _IP6_TUNNEL_H2#define _IP6_TUNNEL_H
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/if.h> /* For IFNAMSIZ. */
6#include <linux/in6.h> /* For struct in6_addr. */
5 7
6#define IPV6_TLV_TNL_ENCAP_LIMIT 48#define IPV6_TLV_TNL_ENCAP_LIMIT 4
7#define IPV6_DEFAULT_TNL_ENCAP_LIMIT 49#define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4
include/uapi/linux/llc.h+1−0
@@ -14,6 +14,7 @@ · 13 unmodified lines
14#define _UAPI__LINUX_LLC_H14#define _UAPI__LINUX_LLC_H
15 15
16#include <linux/socket.h>16#include <linux/socket.h>
17#include <linux/if.h> /* For IFHWADDRLEN. */
17 18
18#define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */19#define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */
19struct sockaddr_llc {20struct sockaddr_llc {
include/uapi/linux/netfilter/nf_conntrack_common.h+4−0
@@ -82,6 +82,10 @@ enum ip_conntrack_status { · 81 unmodified lines
82 IPS_DYING_BIT = 9,82 IPS_DYING_BIT = 9,
83 IPS_DYING = (1 << IPS_DYING_BIT),83 IPS_DYING = (1 << IPS_DYING_BIT),
84 84
85 /* Bits that cannot be altered from userland. */
86 IPS_UNCHANGEABLE_MASK = (IPS_NAT_DONE_MASK | IPS_NAT_MASK |
87 IPS_EXPECTED | IPS_CONFIRMED | IPS_DYING),
88
85 /* Connection has fixed timeout. */89 /* Connection has fixed timeout. */
86 IPS_FIXED_TIMEOUT_BIT = 10,90 IPS_FIXED_TIMEOUT_BIT = 10,
87 IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT),91 IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT),
include/uapi/linux/netfilter/nfnetlink_queue.h+1−1
@@ -36,7 +36,7 @@ enum nfqnl_vlan_attr { · 35 unmodified lines
36 NFQA_VLAN_TCI, /* __be16 skb htons(vlan_tci) */36 NFQA_VLAN_TCI, /* __be16 skb htons(vlan_tci) */
37 __NFQA_VLAN_MAX,37 __NFQA_VLAN_MAX,
38};38};
39#define NFQA_VLAN_MAX (__NFQA_VLAN_MAX + 1)39#define NFQA_VLAN_MAX (__NFQA_VLAN_MAX - 1)
40 40
41enum nfqnl_attr_type {41enum nfqnl_attr_type {
42 NFQA_UNSPEC,42 NFQA_UNSPEC,
include/uapi/linux/rds.h+5−5
@@ -195,14 +195,14 @@ enum rds_message_rxpath_latency { · 194 unmodified lines
195};195};
196 196
197struct rds_rx_trace_so {197struct rds_rx_trace_so {
198 u8 rx_traces;198 __u8 rx_traces;
199 u8 rx_trace_pos[RDS_MSG_RX_DGRAM_TRACE_MAX];199 __u8 rx_trace_pos[RDS_MSG_RX_DGRAM_TRACE_MAX];
200};200};
201 201
202struct rds_cmsg_rx_trace {202struct rds_cmsg_rx_trace {
203 u8 rx_traces;203 __u8 rx_traces;
204 u8 rx_trace_pos[RDS_MSG_RX_DGRAM_TRACE_MAX];204 __u8 rx_trace_pos[RDS_MSG_RX_DGRAM_TRACE_MAX];
205 u64 rx_trace[RDS_MSG_RX_DGRAM_TRACE_MAX];205 __u64 rx_trace[RDS_MSG_RX_DGRAM_TRACE_MAX];
206};206};
207 207
208/*208/*
include/uapi/linux/seg6.h+1−0
@@ -15,6 +15,7 @@ · 14 unmodified lines
15#define _UAPI_LINUX_SEG6_H15#define _UAPI_LINUX_SEG6_H
16 16
17#include <linux/types.h>17#include <linux/types.h>
18#include <linux/in6.h> /* For struct in6_addr. */
18 19
19/*20/*
20 * SRH21 * SRH
include/uapi/linux/seg6_iptunnel.h+2−0
@@ -14,6 +14,8 @@ · 13 unmodified lines
14#ifndef _UAPI_LINUX_SEG6_IPTUNNEL_H14#ifndef _UAPI_LINUX_SEG6_IPTUNNEL_H
15#define _UAPI_LINUX_SEG6_IPTUNNEL_H15#define _UAPI_LINUX_SEG6_IPTUNNEL_H
16 16
17#include <linux/seg6.h> /* For struct ipv6_sr_hdr. */
18
17enum {19enum {
18 SEG6_IPTUNNEL_UNSPEC,20 SEG6_IPTUNNEL_UNSPEC,
19 SEG6_IPTUNNEL_SRH,21 SEG6_IPTUNNEL_SRH,

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