summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'forwarding-selftest-fixes'David S. Miller2018-03-028-33/+53
|\
| * selftests: forwarding: Add description to the multipath testsDavid Ahern2018-03-021-17/+20
| * selftests: forwarding: Use PING6 instead of ping for ipv6 multipath testDavid Ahern2018-03-021-1/+1
| * selftests: forwarding: Handle 0 for packet difference in multipath testsDavid Ahern2018-03-021-0/+7
| * selftests: forwarding: Only check tc version for tc testsDavid Ahern2018-03-027-15/+25
|/
* fib_rules: FRA_GENERIC_POLICY updates for ip proto, sport and dport attrsRoopa Prabhu2018-03-021-1/+5
* ipv6: allow userspace to add IFA_F_OPTIMISTIC addressesSabrina Dubroca2018-03-011-1/+34
* net: Fix spelling mistake "greater then" -> "greater than"Gal Pressman2018-03-012-2/+2
* net: phylink: Remove redundant netdev.phydev assignmentRichard Cochran2018-03-011-2/+0
* Merge branch 'smc-link-layer-control-enhancements'David S. Miller2018-03-018-138/+592
|\
| * net/smc: prevent new connections on link groupKarsten Graul2018-03-014-18/+12
| * net/smc: process add/delete link messagesKarsten Graul2018-03-015-7/+223
| * net/smc: do not allow eyecatchers in rmbeKarsten Graul2018-03-014-3/+27
| * net/smc: process confirm/delete rkey messagesKarsten Graul2018-03-014-10/+186
| * net/smc: respond to test link messagesKarsten Graul2018-03-012-1/+56
| * net/smc: remove unused fields from smc structuresKarsten Graul2018-03-014-18/+8
| * net/smc: move netinfo function to file smc_clc.cKarsten Graul2018-03-014-45/+45
| * net/smc: cleanup smc_llc.h and smc_clc.h headersStefan Raspl2018-03-015-38/+37
|/
* Merge branch 'ipv4-ipv6-mcast-align'David S. Miller2018-03-0112-1172/+1249
|\
| * ipmr, ip6mr: Unite dumproute flowsYuval Mintz2018-03-014-239/+230
| * ip6mr: Remove MFC_NOTIFY and refactor flagsYuval Mintz2018-03-014-15/+9
| * ipmr, ip6mr: Unite vif seq functionsYuval Mintz2018-03-014-89/+76
| * ipmr, ip6mr: Unite mfc seq logicYuval Mintz2018-03-014-178/+143
| * ipmr, ip6mr: Unite logic for searching in MFC cacheYuval Mintz2018-03-014-117/+134
| * ipmr, ip6mr: Make mfc_cache a common structureYuval Mintz2018-03-016-303/+312
| * ipmr, ip6mr: Unite creation of new mr_tableYuval Mintz2018-03-014-37/+64
| * mroute*: Make mr_table a common structYuval Mintz2018-03-016-187/+186
| * ip6mr: Align hash implementation to ipmrYuval Mintz2018-03-012-159/+184
| * ip6mr: Make mroute_sk rcu-basedYuval Mintz2018-03-013-22/+31
| * ipmr,ipmr6: Define a uniform vif_deviceYuval Mintz2018-03-019-63/+117
|/
* Merge branch 'fib_rules-support-sport-dport-and-proto-match'David S. Miller2018-03-0114-31/+292
|\
| * ipv6: route: dissect flow in input path if fib rules need itRoopa Prabhu2018-03-016-12/+72
| * ipv6: route: dissect flow in input path if fib rules need itRoopa Prabhu2018-03-015-16/+65
| * ipv6: fib6_rules: support for match on sport, dport and ip protoRoopa Prabhu2018-03-011-0/+11
| * ipv4: fib_rules: support match on sport, dport and ip protoRoopa Prabhu2018-03-011-0/+11
| * net: fib_rules: support for match on ip_proto, sport and dportRoopa Prabhu2018-03-013-3/+133
|/
* r8169: fix interrupt number after adding support for MSI-X interruptsHeiner Kallweit2018-02-281-2/+3
* Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2018-02-286-20/+23
|\
| * fm10k: bump version numberJacob Keller2018-02-281-2/+2
| * fm10k: fix incorrect warning for function prototypeJacob Keller2018-02-281-1/+1
| * fm10k: fix function doxygen commentsJacob Keller2018-02-285-17/+20
* | Merge branch 'selftests-forwarding-Add-VRF-based-tests'David S. Miller2018-02-2813-0/+1825
|\ \
| * | selftests: forwarding: Introduce basic shared blocks testsJiri Pirko2018-02-282-0/+128
| * | selftests: forwarding: Introduce basic tc chains testsJiri Pirko2018-02-281-0/+122
| * | selftests: forwarding: Introduce tc actions testsJiri Pirko2018-02-281-0/+195
| * | selftests: forwarding: Introduce tc flower matching testsJiri Pirko2018-02-282-0/+219
| * | selftests: forwarding: Allow to get netdev interfaces names from commandlineJiri Pirko2018-02-281-0/+15
| * | selftests: forwarding: Add MAC get helperJiri Pirko2018-02-281-0/+7
| * | selftests: forwarding: Add tc offload check helperJiri Pirko2018-02-281-0/+13
| * | selftests: forwarding: Test IPv6 weighted nexthopsIdo Schimmel2018-02-281-0/+36