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
2424 #include <linux/socket.h> /* for "struct sockaddr" et al */
2525 #include <linux/compiler.h> /* for "__user" et al */
2626
27+#ifndef __KERNEL__
28+#include <sys/socket.h> /* for struct sockaddr. */
29+#endif
30+
2731 #if __UAPI_DEF_IF_IFNAMSIZ
2832 #define IFNAMSIZ 16
2933 #endif /* __UAPI_DEF_IF_IFNAMSIZ */
include/uapi/linux/ip6_tunnel.h+2−0
@@ -2,6 +2,8 @@ · 1 unmodified line
22 #define _IP6_TUNNEL_H
33
44 #include <linux/types.h>
5+#include <linux/if.h> /* For IFNAMSIZ. */
6+#include <linux/in6.h> /* For struct in6_addr. */
57
68 #define IPV6_TLV_TNL_ENCAP_LIMIT 4
79 #define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4
include/uapi/linux/llc.h+1−0
@@ -14,6 +14,7 @@ · 13 unmodified lines
1414 #define _UAPI__LINUX_LLC_H
1515
1616 #include <linux/socket.h>
17+#include <linux/if.h> /* For IFHWADDRLEN. */
1718
1819 #define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */
1920 struct sockaddr_llc {
include/uapi/linux/netfilter/nf_conntrack_common.h+4−0
@@ -82,6 +82,10 @@ enum ip_conntrack_status { · 81 unmodified lines
8282 IPS_DYING_BIT = 9,
8383 IPS_DYING = (1 << IPS_DYING_BIT),
8484
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+
8589 /* Connection has fixed timeout. */
8690 IPS_FIXED_TIMEOUT_BIT = 10,
8791 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
3636 NFQA_VLAN_TCI, /* __be16 skb htons(vlan_tci) */
3737 __NFQA_VLAN_MAX,
3838 };
39−#define NFQA_VLAN_MAX (__NFQA_VLAN_MAX + 1)
39+#define NFQA_VLAN_MAX (__NFQA_VLAN_MAX - 1)
4040
4141 enum nfqnl_attr_type {
4242 NFQA_UNSPEC,
include/uapi/linux/rds.h+5−5
@@ -195,14 +195,14 @@ enum rds_message_rxpath_latency { · 194 unmodified lines
195195 };
196196
197197 struct rds_rx_trace_so {
198− u8 rx_traces;
199− u8 rx_trace_pos[RDS_MSG_RX_DGRAM_TRACE_MAX];
198+ __u8 rx_traces;
199+ __u8 rx_trace_pos[RDS_MSG_RX_DGRAM_TRACE_MAX];
200200 };
201201
202202 struct rds_cmsg_rx_trace {
203− u8 rx_traces;
204− u8 rx_trace_pos[RDS_MSG_RX_DGRAM_TRACE_MAX];
205− u64 rx_trace[RDS_MSG_RX_DGRAM_TRACE_MAX];
203+ __u8 rx_traces;
204+ __u8 rx_trace_pos[RDS_MSG_RX_DGRAM_TRACE_MAX];
205+ __u64 rx_trace[RDS_MSG_RX_DGRAM_TRACE_MAX];
206206 };
207207
208208 /*
include/uapi/linux/seg6.h+1−0
@@ -15,6 +15,7 @@ · 14 unmodified lines
1515 #define _UAPI_LINUX_SEG6_H
1616
1717 #include <linux/types.h>
18+#include <linux/in6.h> /* For struct in6_addr. */
1819
1920 /*
2021 * SRH
include/uapi/linux/seg6_iptunnel.h+2−0
@@ -14,6 +14,8 @@ · 13 unmodified lines
1414 #ifndef _UAPI_LINUX_SEG6_IPTUNNEL_H
1515 #define _UAPI_LINUX_SEG6_IPTUNNEL_H
1616
17+#include <linux/seg6.h> /* For struct ipv6_sr_hdr. */
18+
1719 enum {
1820 SEG6_IPTUNNEL_UNSPEC,
1921 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