summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* netfilter: Kconfig: Make NETFILTER_XT_MATCH_SOCKET select NF_SOCKET_IPV4/6Máté Eckl2018-07-161-2/+2
* openvswitch: use nf_ct_get_tuplepr, invert_tupleprFlorian Westphal2018-07-163-23/+4
* netfilter: utils: move nf_ip6_checksum* from ipv6 to utilsFlorian Westphal2018-07-163-78/+65
* netfilter: utils: move nf_ip_checksum* from ipv4 to utilsFlorian Westphal2018-07-163-64/+55
* netfilter: nft_tproxy: Move nf_tproxy_assign_sock() to nf_tproxy.hMáté Eckl2018-07-162-9/+8
* netfilter: flowtables: use fixed renew timeout on teardownFlorian Westphal2018-07-161-8/+5
* netfilter: nft_reject_bridge: remove unnecessary ttl setTaehee Yoo2018-07-161-2/+1
* Merge branch 'TLS-offload-rx-netdev-and-mlx5'David S. Miller2018-07-1625-191/+846
|\
| * net/mlx5e: IPsec, fix byte count in CQEBoris Pismenny2018-07-163-2/+3
| * net/mlx5: Accel, add common metadata functionsBoris Pismenny2018-07-163-29/+45
| * net/mlx5e: TLS, build TLS netdev from capabilitiesBoris Pismenny2018-07-161-2/+16
| * net/mlx5e: TLS, add software statisticsBoris Pismenny2018-07-163-1/+17
| * net/mlx5e: TLS, add Innova TLS rx data pathBoris Pismenny2018-07-163-3/+118
| * net/mlx5e: TLS, add innova rx supportBoris Pismenny2018-07-162-15/+46
| * net/mlx5: Accel, add TLS rx offload routinesBoris Pismenny2018-07-165-46/+135
| * net/mlx5e: TLS, refactor variable namesBoris Pismenny2018-07-163-8/+8
| * tls: Fix zerocopy_from_iter iov handlingBoris Pismenny2018-07-161-3/+5
| * tls: Add rx inline crypto offloadBoris Pismenny2018-07-165-43/+355
| * tls: Fill software context without allocationBoris Pismenny2018-07-161-12/+22
| * tls: Split tls_sw_release_resources_rxBoris Pismenny2018-07-162-1/+10
| * tls: Split decrypt_skb to two functionsBoris Pismenny2018-07-162-18/+28
| * tls: Refactor tls_offload variable namesBoris Pismenny2018-07-164-28/+27
| * tcp: Don't coalesce decrypted and encrypted SKBsBoris Pismenny2018-07-162-0/+15
| * net: Add TLS rx resync NDOBoris Pismenny2018-07-161-0/+2
| * net: Add TLS RX offload featureIlya Lesokhin2018-07-162-0/+3
| * net: Add decrypted field to skbBoris Pismenny2018-07-162-1/+12
|/
* Merge branch 'mvpp2-add-debugfs-interface'David S. Miller2018-07-168-36/+830
|\
| * net: mvpp2: debugfs: add classifier hit countersMaxime Chevallier2018-07-164-0/+84
| * net: mvpp2: debugfs: add entries for classifier flowsMaxime Chevallier2018-07-164-5/+329
| * net: mvpp2: debugfs: add hit counter stats for Header Parser entriesMaxime Chevallier2018-07-164-0/+40
| * net: mvpp2: add a debugfs interface for the Header ParserMaxime Chevallier2018-07-166-7/+371
| * net: mvpp2: switch to SPDX identifiersAntoine Tenart2018-07-166-24/+6
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2018-07-1467-929/+3119
|\
| * Merge branch 'bpf-tcp-listen-cb'Daniel Borkmann2018-07-159-69/+88
| |\
| | * selftests/bpf: Test case for BPF_SOCK_OPS_TCP_LISTEN_CBAndrey Ignatov2018-07-153-6/+16
| | * selftests/bpf: Better verification in test_tcpbpfAndrey Ignatov2018-07-151-25/+39
| | * selftests/bpf: Switch test_tcpbpf_user to cgroup_helpersAndrey Ignatov2018-07-152-34/+22
| | * selftests/bpf: Fix const'ness in cgroup_helpersAndrey Ignatov2018-07-152-6/+6
| | * bpf: Sync bpf.h to tools/Andrey Ignatov2018-07-151-0/+3
| | * bpf: Add BPF_SOCK_OPS_TCP_LISTEN_CBAndrey Ignatov2018-07-152-0/+4
| |/
| * bpf: btf: print map dump and lookup with btf infoOkash Khawaja2018-07-141-16/+201
| * bpf: btf: add btf print functionalityOkash Khawaja2018-07-142-0/+266
| * bpf: btf: export btf types and name by offset from libOkash Khawaja2018-07-142-20/+48
| * tools: include reallocarray feature test in FEATURE_TESTS_BASICJakub Kicinski2018-07-141-0/+1
| * samples/bpf: xdp_redirect_cpu handle parsing of double VLAN tagged packetsJesper Dangaard Brouer2018-07-141-1/+10
| * Merge branch 'bpf-xdp-driver-and-hw'Daniel Borkmann2018-07-1323-146/+246
| |\
| | * nfp: add support for simultaneous driver and hw XDPJakub Kicinski2018-07-133-40/+26
| | * selftests/bpf: add test for multiple programsJakub Kicinski2018-07-131-0/+63
| | * netdevsim: add support for simultaneous driver and hw XDPJakub Kicinski2018-07-134-33/+12
| | * xdp: support simultaneous driver and hw XDP attachmentJakub Kicinski2018-07-136-62/+96