summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: ovs: remove unused hardirq.hYang Shi2018-01-081-1/+0
* net: caif: remove unused hardirq.hYang Shi2018-01-082-2/+0
* Merge branch 'net-netdev_WARN_ONCE'David S. Miller2018-01-085-14/+14
|\
| * 8139cp: Replace WARN_ONCE with netdev_WARN_ONCEGal Pressman2018-01-081-2/+2
| * bnx2x: Replace WARN_ONCE with netdev_WARN_ONCEGal Pressman2018-01-081-2/+3
| * e1000: Replace WARN_ONCE with netdev_WARN_ONCEGal Pressman2018-01-081-2/+2
| * net/mlx5e: Replace WARN_ONCE with netdev_WARN_ONCEGal Pressman2018-01-081-5/+4
| * net: No line break on netdev_WARN* formattingGal Pressman2018-01-081-2/+2
| * net: Fix netdev_WARN_ONCE macroGal Pressman2018-01-081-2/+2
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2018-01-08108-1403/+3853
|\
| * netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_ex...Jozsef Kadlecsik2018-01-081-0/+2
| * netfilter: ipset: Fix "don't update counters" mode when counters used at the ...Jozsef Kadlecsik2018-01-087-128/+114
| * netfilter: ipset: use swap macro instead of _manually_ swapping valuesGustavo A. R. Silva2018-01-083-18/+6
| * netfilter: nf_tables: flow offload expressionPablo Neira Ayuso2018-01-084-0/+283
| * netfilter: flow table support for the mixed IPv4/IPv6 familyPablo Neira Ayuso2018-01-086-2/+66
| * netfilter: flow table support for IPv6Pablo Neira Ayuso2018-01-085-1/+292
| * netfilter: flow table support for IPv4Pablo Neira Ayuso2018-01-083-0/+294
| * netfilter: add generic flow table infrastructurePablo Neira Ayuso2018-01-084-0/+533
| * netfilter: nf_tables: add flow table netlink frontendPablo Neira Ayuso2018-01-084-1/+870
| * netfilter: nf_conntrack: add IPS_OFFLOAD status bitPablo Neira Ayuso2018-01-085-6/+50
| * netfilter: nf_tables: remove nft_dereference()Pablo Neira Ayuso2018-01-082-6/+3
| * netfilter: remove defensive check on malformed packets from raw socketsPablo Neira Ayuso2018-01-0813-128/+3
| * netfilter: meta: secpath supportFlorian Westphal2018-01-082-0/+45
| * netfilter: remove struct nf_afinfo and its helper functionsPablo Neira Ayuso2018-01-085-65/+6
| * netfilter: remove route_key_size field in struct nf_afinfoPablo Neira Ayuso2018-01-084-9/+16
| * netfilter: move reroute indirection to struct nf_ipv6_opsPablo Neira Ayuso2018-01-088-19/+39
| * netfilter: move route indirection to struct nf_ipv6_opsPablo Neira Ayuso2018-01-0812-58/+68
| * netfilter: remove saveroute indirection in struct nf_afinfoPablo Neira Ayuso2018-01-087-63/+60
| * netfilter: move checksum_partial indirection to struct nf_ipv6_opsPablo Neira Ayuso2018-01-087-38/+50
| * netfilter: move checksum indirection to struct nf_ipv6_opsPablo Neira Ayuso2018-01-088-27/+44
| * netfilter: connlimit: split xt_connlimit into front and backendFlorian Westphal2018-01-086-346/+420
| * netfilter: nf_tables: remove hooks from family definitionPablo Neira Ayuso2018-01-088-43/+37
| * netfilter: nf_tables: remove multihook chains and familiesPablo Neira Ayuso2018-01-089-78/+49
| * netfilter: nf_tables_inet: don't use multihook infrastructure anymorePablo Neira Ayuso2018-01-085-20/+60
| * netfilter: core: support for NFPROTO_INET hook registrationPablo Neira Ayuso2018-01-081-9/+44
| * netfilter: core: pass family as parameter to nf_remove_net_hook()Pablo Neira Ayuso2018-01-081-5/+5
| * netfilter: core: pass hook number, family and device to nf_find_hook_list()Pablo Neira Ayuso2018-01-081-17/+19
| * netfilter: core: add nf_remove_net_hookPablo Neira Ayuso2018-01-081-4/+4
| * netfilter: nf_tables: add nft_set_is_anonymous() helperPablo Neira Ayuso2018-01-083-5/+10
| * netfilter: nf_tables: explicit nft_set_pktinfo() call from hook pathPablo Neira Ayuso2018-01-0812-58/+43
| * netfilter: nf_tables_arp: don't set forward chainPablo Neira Ayuso2018-01-081-1/+0
| * netfilter: nf_tables: reject nat hook registration if prio is before conntrackFlorian Westphal2018-01-081-1/+6
| * netfilter: core: only allow one nat hook per hook pointFlorian Westphal2018-01-085-0/+17
| * netfilter: xtables: add and use xt_request_find_table_lockFlorian Westphal2018-01-085-51/+65
| * netfilter: reduce NF_MAX_HOOKS defineFlorian Westphal2018-01-081-3/+7
| * netfilter: don't allocate space for arp/bridge hooks unless neededFlorian Westphal2018-01-088-0/+29
| * netfilter: don't allocate space for decnet hooks unless neededFlorian Westphal2018-01-083-0/+8
| * netfilter: reduce hook array sizes to what is neededFlorian Westphal2018-01-082-12/+22
| * netfilter: add defines for arp/decnet max hooksFlorian Westphal2018-01-083-1/+12
| * netfilter: reduce size of hook entry point locationsFlorian Westphal2018-01-085-14/+77