summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable-4.12' of git://git.infradead.org/users/pcmoore/auditLinus Torvalds2017-05-031-98/+28
|\
| * audit: normalize NETFILTER_PKTRichard Guy Briggs2017-05-021-97/+27
| * netfilter: use consistent ipv4 network offset in xt_AUDITRichard Guy Briggs2017-05-021-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2017-05-02477-7528/+13822
|\ \
| * | tipc: refactor function tipc_sk_recv_stream()Jon Paul Maloy2017-05-021-84/+71
| * | tipc: refactor function tipc_sk_recvmsg()Jon Paul Maloy2017-05-021-59/+50
| * | ipx: call ipxitf_put() in ioctl error pathDan Carpenter2017-05-021-3/+2
| * | net: sched: add helpers to handle extended actionsJiri Pirko2017-05-021-1/+1
| * | tcp: fix wraparound issue in tcp_lpEric Dumazet2017-05-021-2/+4
| * | bpf: Align packet data properly in program testing framework.David Miller2017-05-021-5/+5
| * | bpf: Do not dereference user pointer in bpf_test_finish().David Miller2017-05-021-4/+5
| * | xdp: fix parameter kdoc for extackJakub Kicinski2017-05-021-1/+1
| * | ipv6: Need to export ipv6_push_frag_opts for tunneling now.David S. Miller2017-05-011-1/+1
| * | xfrm: Indicate xfrm_state offload errorsIlan Tayari2017-05-011-3/+6
| * | net/esp4: Fix invalid esph pointer crashIlan Tayari2017-05-011-0/+1
| * | ip6_tunnel: Fix missing tunnel encapsulation limit optionCraig Gallek2017-05-011-2/+2
| * | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2017-05-019-884/+324
| |\ \
| | * | Bluetooth: Add selftest for ECDH key generationMarcel Holtmann2017-04-302-3/+38
| | * | Bluetooth: zero kpp input for key generationMarcel Holtmann2017-04-301-0/+1
| | * | Bluetooth: Fix user channel for 32bit userspace on 64bit kernelSzymon Janc2017-04-301-1/+2
| | * | Bluetooth: allocate data for kpp on heapSalvatore Benedetto2017-04-302-11/+33
| | * | Bluetooth: convert smp and selftest to crypto kpp APISalvatore Benedetto2017-04-258-878/+259
| * | | flower: check unused bits in MPLS fieldsBenjamin LaHaise2017-05-011-10/+22
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2017-05-0194-737/+765
| |\ \ \
| | * | | netfilter: nf_ct_ext: invoke destroy even when ext is not attachedLiping Zhang2017-05-011-6/+2
| | * | | Merge tag 'ipvs3-for-v4.12' of http://git.kernel.org/pub/scm/linux/kernel/git...Pablo Neira Ayuso2017-05-012-23/+1
| | |\ \ \
| | | * | | ipvs: change comparison on sync_refresh_periodAaron Conole2017-04-281-1/+1
| | | * | | ipvs: remove unused function ip_vs_set_state_timeoutAaron Conole2017-04-281-22/+0
| | * | | | netfilter: snmp: avoid stack size warningFlorian Westphal2017-05-011-6/+6
| | * | | | netfilter: nf_queue: only call synchronize_net twice if nf_queue is activeFlorian Westphal2017-05-014-22/+26
| | * | | | netfilter: nf_log: don't call synchronize_rcu in nf_log_unsetFlorian Westphal2017-05-012-2/+1
| | * | | | netfilter: batch synchronize_net calls during hook unregisterFlorian Westphal2017-05-011-6/+40
| | |/ / /
| | * | | netfilter: don't attach a nat extension by defaultFlorian Westphal2017-04-263-12/+2
| | * | | netfilter: pptp: attach nat extension when neededFlorian Westphal2017-04-262-6/+31
| | * | | netfilter: masquerade: attach nat extension if not presentFlorian Westphal2017-04-262-3/+7
| | * | | netfilter: conntrack: handle initial extension alloc via kreallocFlorian Westphal2017-04-261-36/+15
| | * | | netfilter: conntrack: mark extension structs as constFlorian Westphal2017-04-268-9/+9
| | * | | netfilter: conntrack: remove prealloc supportFlorian Westphal2017-04-262-46/+4
| | * | | netfilter: SYNPROXY: Return NF_STOLEN instead of NF_DROP during handshakingGao Feng2017-04-262-13/+28
| | * | | ebtables: remove nf_hook_register usageFlorian Westphal2017-04-264-49/+46
| | * | | netfilter: decnet: only register hooks in init namespaceFlorian Westphal2017-04-261-2/+2
| | * | | ipvs: convert to use pernet nf_hook apiFlorian Westphal2017-04-261-10/+9
| | * | | netfilter: synproxy: only register hooks when neededFlorian Westphal2017-04-262-68/+78
| | * | | netfilter: tcp: Use TCP_MAX_WSCALE instead of literal 14Gao Feng2017-04-192-6/+5
| | * | | netfilter: ipvs: fix incorrect conflict resolutionFlorian Westphal2017-04-191-1/+2
| | * | | nefilter: eache: reduce struct size from 32 to 24 byteFlorian Westphal2017-04-191-0/+3
| | * | | netfilter: allow early drop of assured conntracksFlorian Westphal2017-04-194-0/+99
| | * | | netfilter: conntrack: use u8 for extension sizes againFlorian Westphal2017-04-191-0/+33
| | * | | netfilter: remove last traces of variable-sized extensionsFlorian Westphal2017-04-191-9/+7
| | * | | netfilter: helpers: remove data_len usage for inkernel helpersFlorian Westphal2017-04-198-28/+13