Pull networking fixes from David Miller: 1) Use 32-bit index for tails calls in s390 bpf JIT, from Ilya Leoshkevich. 2) Fix missed EPOLLOUT events in TCP, from Eric Dumazet. Same fix for SMC from Jason Baron. 3) ipv6_mc_may_pull() should return 0 for malformed packets, not -EINVAL. From Stefano Brivio. 4) Don't forget to unpin umem xdp pages in error path of xdp_umem_reg(). From Ivan Khoronzhuk. 5) Fix sta object leak in mac80211, from Johannes Berg. 6) Fix regression by not configuring PHYLINK on CPU port of bcm_sf2 switches. From Florian Fainelli. 7) Revert DMA sync removal from r8169 which was causing regressions on some MIPS Loongson platforms. From Heiner Kallweit. 8) Use after free in flow dissector, from Jakub Sitnicki. 9) Fix NULL derefs of net devices during ICMP processing across collect_md tunnels, from Hangbin Liu. 10) proto_register() memory leaks, from Zhang Lin. 11) Set NLM_F_MULTI flag in multipart netlink messages consistently, from John Fastabend. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (66 commits) r8152: Set memory to all 0xFFs on failed reg reads openvswitch: Fix conntrack cache with timeout ipv4: mpls: fix mpls_xmit for iptunnel nexthop: Fix nexthop_num_path for blackhole nexthops net: rds: add service level support in rds-info net: route dump netlink NLM_F_MULTI flag missing s390/qeth: reject oversized SNMP requests sock: fix potential memory leak in proto_register() MAINTAINERS: Add phylink keyword to SFF/SFP/SFP+ MODULE SUPPORT xfrm/xfrm_policy: fix dst dev null pointer dereference in collect_md mode ipv4/icmp: fix rt dst dev null pointer dereference openvswitch: Fix log message in ovs conntrack bpf: allow narrow loads of some sk_reuseport_md fields with offset > 0 bpf: fix use after free in prog symbol exposure bpf: fix precision tracking in presence of bpf2bpf calls flow_dissector: Fix potential use-after-free on BPF_PROG_DETACH Revert "r8169: remove not needed call to dma_sync_single_for_device" ipv6: propagate ipv6_add_dev's error returns out of ipv6_find_idev net/ncsi: Fix the payload copying for the request coming from Netlink qed: Add cleanup in qed_slowpath_start() ...
Showing the changes to include/uapi/linux (2 of 67 files). Show all
Unified · Split
| @@ -11,4 +11,9 @@ struct xt_nfacct_match_info { · 10 unmodified lines | ||
| 11 | 11 | struct nf_acct *nfacct; |
| 12 | 12 | }; |
| 13 | 13 | |
| 14 | +struct xt_nfacct_match_info_v1 { | |
| 15 | + char name[NFACCT_NAME_MAX]; | |
| 16 | + struct nf_acct *nfacct __attribute__((aligned(8))); | |
| 17 | +}; | |
| 18 | + | |
| 14 | 19 | #endif /* _XT_NFACCT_MATCH_H */ |
| @@ -250,6 +250,7 @@ struct rds_info_rdma_connection { · 249 unmodified lines | ||
| 250 | 250 | __u32 rdma_mr_max; |
| 251 | 251 | __u32 rdma_mr_size; |
| 252 | 252 | __u8 tos; |
| 253 | + __u8 sl; | |
| 253 | 254 | __u32 cache_allocs; |
| 254 | 255 | }; |
| 255 | 256 | |
| @@ -265,6 +266,7 @@ struct rds6_info_rdma_connection { · 9 unmodified lines | ||
| 265 | 266 | __u32 rdma_mr_max; |
| 266 | 267 | __u32 rdma_mr_size; |
| 267 | 268 | __u8 tos; |
| 269 | + __u8 sl; | |
| 268 | 270 | __u32 cache_allocs; |
| 269 | 271 | }; |
| 270 | 272 | |