summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-07-0640-532/+699
|\
| * netfilter: nf_log: fix error on write NONE to logger choice sysctlPavel Tikhomirov2016-07-051-5/+6
| * netfilter: Convert FWINV<[foo]> macros and uses to NF_INVFJoe Perches2016-07-0312-138/+144
| * netfilter: Remove references to obsolete CONFIG_IP_ROUTE_FWMARKMoritz Sichert2016-07-011-6/+4
| * etherdevice.h & bridge: netfilter: Add and use ether_addr_equal_maskedJoe Perches2016-07-014-49/+57
| * netfilter: x_tables: simplify ip{6}table_mangle_hook()Pablo Neira Ayuso2016-07-012-8/+0
| * netfilter: nf_tables: add support for inverted logic in nft_lookupArturo Borrero2016-06-242-5/+38
| * netfilter: nf_tables: get rid of NFT_BASECHAIN_DISABLEDPablo Neira Ayuso2016-06-242-38/+25
| * netfilter: conntrack: allow increasing bucket size via sysctl tooFlorian Westphal2016-06-244-19/+62
| * netfilter: nft_hash: support deletion of inactive elementsPablo Neira Ayuso2016-06-241-2/+4
| * netfilter: nft_rbtree: check for next generation when deactivating elementsPablo Neira Ayuso2016-06-241-1/+1
| * netfilter: nf_tables: add generation mask to setsPablo Neira Ayuso2016-06-244-35/+54
| * netfilter: nf_tables: add generation mask to chainsPablo Neira Ayuso2016-06-242-33/+60
| * netfilter: nf_tables: add generation mask to tablesPablo Neira Ayuso2016-06-242-45/+62
| * netfilter: nf_tables: add generic macros to check for generation maskPablo Neira Ayuso2016-06-242-38/+32
| * netfilter: xt_NFLOG: nflog-range does not truncate packetsVishwanath Pai2016-06-244-4/+21
| * netfilter: nf_reject_ipv4: don't send tcp RST if the packet is non-TCPLiping Zhang2016-06-241-0/+3
| * netfilter: Allow xt_owner in any user namespaceEric W. Biederman2016-06-231-6/+35
| * netfilter: move zone info into struct nf_connFlorian Westphal2016-06-234-57/+16
| * netfilter: nf_log: Remove NULL checkShivani Bhardwaj2016-06-231-1/+1
| * netfilter: make comparision helpers stub functions in ZONES=n caseFlorian Westphal2016-06-231-0/+12
| * netfilter: conntrack: align nf_conn on cacheline boundaryFlorian Westphal2016-06-231-1/+1
| * netfilter: xt_TRACE: add explicitly nf_logger_find_get callLiping Zhang2016-06-231-6/+19
| * netfilter: nf_log: handle NFPROTO_INET properly in nf_logger_[find_get|put]Liping Zhang2016-06-232-20/+21
| * netfilter: x_tables: fix possible ZERO_SIZE_PTR pointer dereferencing error.Xiubo Li2016-06-231-0/+3
| * netfilter: helper: avoid extra expectation iterations on unregisterFlorian Westphal2016-06-071-29/+32
| * bridge: netfilter: checkpatch data type fixesTobin C Harding2016-06-071-20/+20
* | net: vrf: Add support for PREROUTING rules on vrf deviceDavid Ahern2016-07-051-0/+21
* | connector: make cn_proc explicitly non-modularPaul Gortmaker2016-07-051-3/+1
* | net: hns: fix return value check in hns_dsaf_get_cfg()Wei Yongjun2016-07-051-8/+8
* | Merge branch 'mlxsw-ipv4-unicast-routing'David S. Miller2016-07-0520-12/+1747
|\ \
| * | mlxsw: Add the unresolved next-hops probesYotam Gigi2016-07-052-1/+34
| * | mlxsw: spectrum_router: Add the nexthop neigh activity updateYotam Gigi2016-07-052-15/+61
| * | mlxsw: spectrum_router: Implement next-hop routingJiri Pirko2016-07-052-2/+492
| * | mlxsw: reg: Add Router Algorithmic LPM ECMP Update RegisterJiri Pirko2016-07-051-0/+69
| * | mlxsw: reg: Add Router Adjacency Table registerYotam Gigi2016-07-051-0/+133
| * | mlxsw: Introduce simplistic KVD linear area managerJiri Pirko2016-07-053-1/+99
| * | mlxsw: spectrum: Define sizes of KVD areasJiri Pirko2016-07-052-0/+8
| * | mlxsw: Add KVD sizes configuration into profileJiri Pirko2016-07-053-1/+62
| * | mlxsw: spectrum_router: Offload neighbours based on NUD state changeYotam Gigi2016-07-051-0/+103
| * | mlxsw: spectrum_router: Periodically update the kernel's neigh tableYotam Gigi2016-07-052-2/+194
| * | neigh: Send a notification when DELAY_PROBE_TIME changesIdo Schimmel2016-07-052-0/+3
| * | mlxsw: reg: Add Router Algorithmic LPM Unicast Host Table Dump registerYotam Gigi2016-07-051-0/+147
| * | mlxsw: reg: Add Router Algorithmic LPM Unicast Host Table registerYotam Gigi2016-07-051-0/+141
| * | mlxsw: spectrum_router: Add private neigh tableJiri Pirko2016-07-053-1/+153
| * | net: introduce default neigh_construct/destroy ndo calls for L2 upper devicesJiri Pirko2016-07-056-0/+56
| * | net: add dev arg to ndo_neigh_construct/destroyJiri Pirko2016-07-055-7/+10
|/ /
* | Merge branch 'r6040-next'David S. Miller2016-07-052-33/+28
|\ \
| * | net: r6040: Bump version and dateFlorian Fainelli2016-07-051-2/+2
| * | net: r6040: Update my emailFlorian Fainelli2016-07-052-3/+3
OpenPOWER on IntegriCloud