summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2017-05-0312-59/+162
|\
| * netfilter: nf_tables: check if same extensions are set when adding elementsPablo Neira Ayuso2017-05-031-0/+5
| * Merge tag 'ipvs-fixes-for-v4.11' of http://git.kernel.org/pub/scm/linux/kerne...Pablo Neira Ayuso2017-04-281-5/+17
| |\
| | * ipvs: explicitly forbid ipv6 service/dest creation if ipv6 mod is disabledPaolo Abeni2017-04-281-5/+17
| * | netfilter: x_tables: unlock on error in xt_find_table_lock()Dan Carpenter2017-04-281-1/+3
| |/
| * netfilter: Wrong icmp6 checksum for ICMPV6_TIME_EXCEED in reverse SNATv6 pathDave Johnson2017-04-251-1/+1
| * netfilter: nft_dynset: continue to next expr if _OP_ADD succeededLiping Zhang2017-04-251-3/+2
| * bridge: ebtables: fix reception of frames DNAT-ed to bridge device/portLinus Lüssing2017-04-251-0/+20
| * netfilter: xt_socket: Fix broken IPv6 handlingPeter Tirsek2017-04-241-1/+1
| * netfilter: ctnetlink: acquire ct->lock before operating nf_ct_seqadjLiping Zhang2017-04-241-6/+15
| * netfilter: ctnetlink: make it safer when updating ct->statusLiping Zhang2017-04-241-9/+24
| * netfilter: ctnetlink: fix deadlock due to acquire _expect_lock twiceLiping Zhang2017-04-241-12/+12
| * netfilter: ctnetlink: drop the incorrect cthelper module requestLiping Zhang2017-04-241-16/+1
| * netfilter: nft_set_bitmap: free dummy elements when destroy the setLiping Zhang2017-04-241-0/+5
| * netfilter: nf_ct_helper: permit cthelpers with different names via nfnetlinkLiping Zhang2017-04-241-5/+21
| * openvswitch: Delete conntrack entry clashing with an expectation.Jarno Rajahalme2017-04-241-1/+29
| * netfilter: xt_CT: fix refcnt leak on error pathGao Feng2017-04-241-2/+9
* | netfilter: conntrack: Force inlining of build check to prevent build failureGeert Uytterhoeven2017-05-031-1/+1
* | net: ipv6: Do not duplicate DAD on link upDavid Ahern2017-05-031-2/+3
* | 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