summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mlxsw-Add-tunnel-devlink-trap-support'David S. Miller2020-01-1914-4/+981
|\
| * selftests: devlink_trap_tunnel_vxlan: Add test case for overlay_smac_is_mcAmit Cohen2020-01-191-0/+54
| * mlxsw: Add OVERLAY_SMAC_MC trapAmit Cohen2020-01-192-0/+4
| * devlink: Add overlay source MAC is multicast trapAmit Cohen2020-01-193-0/+8
| * selftests: devlink_trap_tunnel_ipip: Add test case for decap_errorAmit Cohen2020-01-191-0/+265
| * selftests: devlink_trap_tunnel_vxlan: Add test case for decap_errorAmit Cohen2020-01-191-0/+276
| * mlxsw: Add tunnel devlink-trap supportAmit Cohen2020-01-194-3/+19
| * devlink: Add tunnel generic packet trapsAmit Cohen2020-01-193-0/+16
| * mlxsw: spectrum_trap: Reorder cases according to enum orderAmit Cohen2020-01-191-2/+2
| * mlxsw: Add ECN configurations with IPinIP tunnelsAmit Cohen2020-01-193-0/+73
| * mlxsw: reg: Add Tunneling IPinIP Decapsulation ECN Mapping RegisterAmit Cohen2020-01-191-0/+57
| * mlxsw: reg: Add Tunneling IPinIP Encapsulation ECN Mapping RegisterAmit Cohen2020-01-191-0/+31
| * mlxsw: Add NON_ROUTABLE trapAmit Cohen2020-01-192-0/+4
| * devlink: Add non-routable packet trapAmit Cohen2020-01-193-0/+10
| * selftests: devlink_trap_l3_drops: Add test cases of irif and erif disabledAmit Cohen2020-01-191-0/+112
| * mlxsw: Add irif and erif disabled trapsAmit Cohen2020-01-194-0/+51
|/
* Merge branch 'for-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2020-01-1920-361/+1253
|\
| * net/mlx5: E-Switch, Increase number of chains and prioritiesPaul Blakey2020-01-173-12/+232
| * net/mlx5: E-Switch, Refactor chains and prioritiesPaul Blakey2020-01-177-292/+637
| * net/mlx5: ft: Check prio and chain sanity for ft offloadPaul Blakey2020-01-171-7/+20
| * net/mlx5: ft: Use getter function to get ft chainPaul Blakey2020-01-173-1/+9
| * net/mlx5: Allow creating autogroups with reserved entriesPaul Blakey2020-01-173-9/+19
| * net/mlx5: Add ignore level support fwd to table rulesPaul Blakey2020-01-173-3/+19
| * net/mlx5: fs_core: Introduce unmanaged flow tablesPaul Blakey2020-01-172-12/+31
| * Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sae...Saeed Mahameed2020-01-1713-63/+324
| |\
| | * net/mlx5: Refactor mlx5_create_auto_grouped_flow_tablePaul Blakey2020-01-178-48/+52
| | * net/mlx5e: Add discard counters per priorityAharon Landau2020-01-162-1/+4
| | * net/mlx5e: Expose FEC feilds and related capability bitAya Levin2020-01-161-1/+15
| | * net/mlx5: Add mlx5_ifc definitions for connection tracking supportPaul Blakey2020-01-161-4/+20
| | * net/mlx5: Add copy header action struct layoutHamdan Igbaria2020-01-161-0/+16
| | * net/mlx5: Expose resource dump register mappingAya Levin2020-01-162-1/+130
| | * net/mlx5: Add structures and defines for MIRC registerEran Ben Elisha2020-01-162-0/+9
| | * net/mlx5: Read MCAM register groups 1 and 2Eran Ben Elisha2020-01-163-8/+23
| | * net/mlx5: Add structures layout for new MCAM access reg groupsEran Ben Elisha2020-01-161-0/+24
| | * net/mlx5: Expose vDPA emulation device capabilitiesYishai Hadas2020-01-102-0/+16
| | * net/mlx5: Add Virtio Emulation related device capabilitiesYishai Hadas2020-01-101-0/+15
* | | net: phy: adin: fix a warning about msleepDejin Zheng2020-01-191-1/+1
* | | Merge branch 'Rate-adaptation-for-Felix-DSA-switch'David S. Miller2020-01-191-7/+10
|\ \ \
| * | | net: dsa: felix: Allow PHY to AN 10/100/1000 with 2500 serdes linkAlex Marginean2020-01-191-5/+4
| * | | net: dsa: felix: Handle PAUSE RX regardless of AN resultAlex Marginean2020-01-191-2/+6
|/ / /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2020-01-199-169/+352
|\ \ \
| * | | netfilter: bitwise: add support for shifts.Jeremy Sowden2020-01-162-2/+84
| * | | netfilter: bitwise: add NFTA_BITWISE_DATA attribute.Jeremy Sowden2020-01-162-0/+8
| * | | netfilter: bitwise: only offload boolean operations.Jeremy Sowden2020-01-161-0/+3
| * | | netfilter: bitwise: add helper for dumping boolean operations.Jeremy Sowden2020-01-161-8/+21
| * | | netfilter: bitwise: add helper for evaluating boolean operations.Jeremy Sowden2020-01-161-3/+14
| * | | netfilter: bitwise: add helper for initializing boolean operations.Jeremy Sowden2020-01-161-25/+41
| * | | netfilter: bitwise: add NFTA_BITWISE_OP netlink attribute.Jeremy Sowden2020-01-162-0/+28
| * | | netfilter: bitwise: replace gotos with returns.Jeremy Sowden2020-01-161-8/+5
| * | | netfilter: bitwise: remove NULL comparisons from attribute checks.Jeremy Sowden2020-01-161-5/+5