summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2018-05-2515-266/+933
|\
| * xdp: change ndo_xdp_xmit API to support bulkingJesper Dangaard Brouer2018-05-251-4/+4
| * xdp: introduce xdp_return_frame_rx_napiJesper Dangaard Brouer2018-05-251-4/+16
| * xdp: add tracepoint for devmap like cpumap haveJesper Dangaard Brouer2018-05-251-1/+1
| * bpf: devmap introduce dev_map_enqueueJesper Dangaard Brouer2018-05-251-13/+2Star
| * ipv6: sr: Add seg6local action End.BPFMathieu Xhonneux2018-05-242-2/+191
| * bpf: Split lwt inout verifier structuresMathieu Xhonneux2018-05-241-31/+52
| * bpf: Add IPv6 Segment Routing helpersMathieu Xhonneux2018-05-243-23/+269
| * ipv6: sr: export function lookup_nexthopMathieu Xhonneux2018-05-241-9/+11
| * bpf: Add mtu checking to FIB forwarding helperDavid Ahern2018-05-221-7/+35
| * net/ipv6: Add helper to return path MTU based on fib resultDavid Ahern2018-05-223-0/+57
| * net/ipv4: Add helper to return path MTU based on fib resultDavid Ahern2018-05-221-0/+31
| * xsk: convert atomic_t to refcount_tBjörn Töpel2018-05-222-4/+4
| * xsk: simplified umem setupBjörn Töpel2018-05-223-55/+51Star
| * xsk: add missing write- and data-dependency barrierBjörn Töpel2018-05-221-5/+9
| * xsk: remove explicit ring structure from uapiBjörn Töpel2018-05-222-0/+46
| * xsk: proper queue id check at bindMagnus Karlsson2018-05-221-1/+7
| * xsk: remove rebind supportBjörn Töpel2018-05-221-21/+9Star
| * bpf: allow sk_msg programs to read sock fieldsJohn Fastabend2018-05-181-3/+111
| * xsk: proper '=' alignmentBjörn Töpel2018-05-181-18/+18
| * xsk: fixed some cases of unnecessary parenthesesBjörn Töpel2018-05-183-6/+5Star
| * xsk: remove newline at end of fileBjörn Töpel2018-05-181-1/+0Star
| * xsk: clean up SPDX headersBjörn Töpel2018-05-186-60/+6Star
* | Merge tag 'batadv-next-for-davem-20180524' of git://git.open-mesh.org/linux-m...David S. Miller2018-05-246-41/+39Star
|\ \
| * | batman-adv: enable B.A.T.M.A.N. V compilation by defaultMarek Lindner2018-05-141-1/+1
| * | batman-adv: disable ethtool link speed detection when auto negotiation offMarek Lindner2018-05-141-1/+14
| * | batman-adv: fix batadv_interface_tx()'s return typeLuc Van Oostenryck2018-04-251-2/+2
| * | batman-adv: Remove unused dentry without DEBUGFSSven Eckelmann2018-04-221-0/+6
| * | batman-adv: Avoid bool in structuresSven Eckelmann2018-04-221-7/+7
| * | batman-adv: Avoid old nodes disabling multicast optimizations completelyLinus Lüssing2018-04-223-27/+6Star
| * | batman-adv: Disable CONFIG_BATMAN_ADV_DEBUGFS by defaultSven Eckelmann2018-04-221-2/+2
| * | batman-adv: Start new development cycleSimon Wunderlich2018-04-221-1/+1
* | | bpfilter: don't pass O_CREAT when opening console for debugJakub Kicinski2018-05-241-1/+1
* | | bpfilter: fix build dependencyAlexei Starovoitov2018-05-241-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2018-05-2321-497/+978
|\ \ \
| * | | netfilter: nfnetlink_queue: resolve clash for unconfirmed conntracksPablo Neira Ayuso2018-05-233-19/+127
| * | | netfilter: add struct nf_nat_hook and use itPablo Neira Ayuso2018-05-234-26/+20Star
| * | | netfilter: add struct nf_ct_hook and use itPablo Neira Ayuso2018-05-232-10/+13
| * | | netfilter: ip6t_rpfilter: provide input interface for route lookupVincent Bernat2018-05-231-0/+2
| * | | netfilter: nft_set_rbtree: add timeout supportPablo Neira Ayuso2018-05-231-3/+72
| * | | netfilter: make NF_OSF non-visible symbolFernando Fernandez Mancera2018-05-231-1/+1
| * | | netfilter: lift one-nat-hook-only restrictionFlorian Westphal2018-05-232-69/+2Star
| * | | netfilter: nf_nat: add nat type hooks to nat coreFlorian Westphal2018-05-237-237/+227Star
| * | | netfilter: nf_nat: add nat hook register functions to nf_natFlorian Westphal2018-05-231-0/+157
| * | | netfilter: core: export raw versions of add/delete hook functionsFlorian Westphal2018-05-232-21/+59
| * | | netfilter: nf_tables: allow chain type to override hook registerFlorian Westphal2018-05-233-19/+43
| * | | netfilter: xtables: allow table definitions not backed by hook_opsFlorian Westphal2018-05-232-2/+8
| * | | netfilter: nf_nat: move common nat code to nat coreFlorian Westphal2018-05-233-99/+74Star
| * | | netfilter: nft_hash: add map lookups for hashing operationsLaura Garcia Liebana2018-05-171-1/+130
| * | | netfilter: nft_numgen: add map lookups for numgen random operationsLaura Garcia Liebana2018-05-171-4/+72