Pull networking fixes from David Miller: 1) Fix route leak in xfrm_bundle_create(). 2) In mac80211, validate user rate mask before configuring it. From Johannes Berg. 3) Properly enforce memory limits in fair queueing code, from Toke Hoiland-Jorgensen. 4) Fix lockdep splat in inet_csk_route_req(), from Eric Dumazet. 5) Fix TSO header allocation and management in mvpp2 driver, from Yan Markman. 6) Don't take socket lock in BH handler in strparser code, from Tom Herbert. 7) Don't show sockets from other namespaces in AF_UNIX code, from Andrei Vagin. 8) Fix double free in error path of tap_open(), from Girish Moodalbail. 9) Fix TX map failure path in igb and ixgbe, from Jean-Philippe Brucker and Alexander Duyck. 10) Fix DCB mode programming in stmmac driver, from Jose Abreu. 11) Fix err_count handling in various tunnels (ipip, ip6_gre). From Xin Long. 12) Properly align SKB head before building SKB in tuntap, from Jason Wang. 13) Avoid matching qdiscs with a zero handle during lookups, from Cong Wang. 14) Fix various endianness bugs in sctp, from Xin Long. 15) Fix tc filter callback races and add selftests which trigger the problem, from Cong Wang. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (73 commits) selftests: Introduce a new test case to tc testsuite selftests: Introduce a new script to generate tc batch file net_sched: fix call_rcu() race on act_sample module removal net_sched: add rtnl assertion to tcf_exts_destroy() net_sched: use tcf_queue_work() in tcindex filter net_sched: use tcf_queue_work() in rsvp filter net_sched: use tcf_queue_work() in route filter net_sched: use tcf_queue_work() in u32 filter net_sched: use tcf_queue_work() in matchall filter net_sched: use tcf_queue_work() in fw filter net_sched: use tcf_queue_work() in flower filter net_sched: use tcf_queue_work() in flow filter net_sched: use tcf_queue_work() in cgroup filter net_sched: use tcf_queue_work() in bpf filter net_sched: use tcf_queue_work() in basic filter net_sched: introduce a workqueue for RCU callbacks of tc filter sctp: fix some type cast warnings introduced since very beginning sctp: fix a type cast warnings that causes a_rwnd gets the wrong value sctp: fix some type cast warnings introduced by transport rhashtable sctp: fix some type cast warnings introduced by stream reconf ...
Showing the changes to include/uapi/linux (2 of 78 files). Show all
Unified · Split
| @@ -575,7 +575,7 @@ union bpf_attr { · 574 unmodified lines | |||
| 575 | * @map: pointer to sockmap | 575 | * @map: pointer to sockmap |
| 576 | * @key: key to lookup sock in map | 576 | * @key: key to lookup sock in map |
| 577 | * @flags: reserved for future use | 577 | * @flags: reserved for future use |
| 578 | * Return: SK_REDIRECT | 578 | * Return: SK_PASS |
| 579 | * | 579 | * |
| 580 | * int bpf_sock_map_update(skops, map, key, flags) | 580 | * int bpf_sock_map_update(skops, map, key, flags) |
| 581 | * @skops: pointer to bpf_sock_ops | 581 | * @skops: pointer to bpf_sock_ops |
| @@ -786,8 +786,8 @@ struct xdp_md { · 204 unmodified lines | |||
| 786 | }; | 786 | }; |
| 787 | 787 | ||
| 788 | enum sk_action { | 788 | enum sk_action { |
| 789 | SK_ABORTED = 0, | 789 | SK_DROP = 0, |
| 790 | SK_DROP, | 790 | SK_PASS, |
| 791 | SK_REDIRECT, | 791 | SK_REDIRECT, |
| 792 | }; | 792 | }; |
| 793 | 793 | ||
| @@ -376,7 +376,7 @@ struct sctp_remote_error { · 375 unmodified lines | |||
| 376 | __u16 sre_type; | 376 | __u16 sre_type; |
| 377 | __u16 sre_flags; | 377 | __u16 sre_flags; |
| 378 | __u32 sre_length; | 378 | __u32 sre_length; |
| 379 | __u16 sre_error; | 379 | __be16 sre_error; |
| 380 | sctp_assoc_t sre_assoc_id; | 380 | sctp_assoc_t sre_assoc_id; |
| 381 | __u8 sre_data[0]; | 381 | __u8 sre_data[0]; |
| 382 | }; | 382 | }; |