summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* netfilter: nat: use test_and_clear_bit when deleting ct from bysource listFlorian Westphal2017-10-241-6/+3
* netfilter: ipset: deduplicate prefixlen mapsAaron Conole2017-10-041-258/+137
* netfilter: ipset: Fix sparse warningsJozsef Kadlecsik2017-10-041-1/+1
* netfilter: ipset: Compress return logicsimran singhal2017-10-041-4/+1
* Merge branch 'sctp-stream-schedulers'David S. Miller2017-10-0312-77/+1347
|\
| * sctp: introduce round robin stream schedulerMarcelo Ricardo Leitner2017-10-035-2/+218
| * sctp: introduce priority based stream schedulerMarcelo Ricardo Leitner2017-10-035-2/+377
| * sctp: add sockopt to get/set stream scheduler parametersMarcelo Ricardo Leitner2017-10-032-0/+84
| * sctp: add sockopt to get/set stream schedulerMarcelo Ricardo Leitner2017-10-032-0/+76
| * sctp: introduce stream scheduler foundationsMarcelo Ricardo Leitner2017-10-038-38/+477
| * sctp: introduce sctp_chunk_stream_noMarcelo Ricardo Leitner2017-10-031-0/+5
| * sctp: introduce struct sctp_stream_out_extMarcelo Ricardo Leitner2017-10-035-13/+50
| * sctp: factor out stream->in allocationMarcelo Ricardo Leitner2017-10-031-8/+28
| * sctp: factor out stream->out allocationMarcelo Ricardo Leitner2017-10-031-20/+32
| * sctp: silence warns on sctp_stream_init allocationsMarcelo Ricardo Leitner2017-10-031-1/+7
|/
* Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2017-10-037-137/+665
|\
| * fm10k: fix mis-ordered parameters in declaration for .ndo_set_vf_bwJacob Keller2017-10-032-6/+7
| * fm10k: prefer %s and __func__ for diagnostic printsJacob Keller2017-10-031-2/+16
| * fm10k: Fix misuse of net_ratelimit()Joe Perches2017-10-031-1/+2
| * fm10k: bump version numberJacob Keller2017-10-031-1/+1
| * fm10k: use the MAC/VLAN queue for VF<->PF MAC/VLAN requestsJacob Keller2017-10-033-4/+133
| * fm10k: introduce a message queue for MAC/VLAN messagesJacob Keller2017-10-033-42/+397
| * fm10k: use generic PM hooks instead of legacy PCIe power hooksJacob Keller2017-10-031-45/+22
| * fm10k: use spinlock to implement mailbox lockJacob Keller2017-10-032-10/+8
| * fm10k: prepare_for_reset() when we lose PCIe LinkJacob Keller2017-10-032-26/+79
* | net: core: decouple ifalias get/set from rtnl lockFlorian Westphal2017-10-034-25/+65
* | bonding: speed/duplex update at NETDEV_UP eventMahesh Bandewar2017-10-031-1/+10
* | mlxsw: spectrum: Add missing error code on allocation failureDan Carpenter2017-10-031-1/+3
* | mlxsw: spectrum: Fix check for IS_ERR() instead of NULLDan Carpenter2017-10-031-2/+2
* | net: dsa: mt7530: make functions mt7530_phy_write staticColin Ian King2017-10-031-1/+2
* | net: dsa: lan9303: make functions lan9303_mdio_phy_{read|write} staticColin Ian King2017-10-031-2/+3
* | Merge branch 'mlxsw-mc-route-offload'David S. Miller2017-10-0310-14/+96
|\ \
| * | mlxsw: spectrum: mr: Support trap-and-forward routesYotam Gigi2017-10-031-9/+8
| * | mlxsw: spectrum: mr_tcam: Add trap-and-forward multicast routeYotam Gigi2017-10-032-0/+9
| * | mlxsw: spectrum: Add trap for multicast trap-and-forward routesYotam Gigi2017-10-032-0/+15
| * | mlxsw: acl: Introduce ACL trap and forward actionYotam Gigi2017-10-032-0/+19
| * | ipv4: ipmr: Don't forward packets already forwarded by hardwareYotam Gigi2017-10-031-5/+32
| * | ipv4: ipmr: Add the parent ID field to VIF structYotam Gigi2017-10-032-0/+12
| * | skbuff: Add the offload_mr_fwd_mark fieldYotam Gigi2017-10-031-0/+1
|/ /
* / cxgb4: Update comment for min_mtuArjun Vynipadath2017-10-031-1/+1
|/
* Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2017-10-0217-74/+837
|\
| * i40e: Stop dropping 802.1ad tags - eth proto 0x88a8Scott Peterson2017-10-027-3/+62
| * i40e: fix client notify of VF resetAlan Brady2017-10-021-2/+2
| * i40e: fix handling of vf_states variableAlan Brady2017-10-022-2/+4
| * i40e: make i40evf_map_rings_to_vectors voidMitch Williams2017-10-021-7/+2
| * i40evf: Enable VF to request an alternate queue allocationAlan Brady2017-10-024-7/+173
| * i40e: ensure reset occurs when disabling VFJacob Keller2017-10-022-11/+35
| * i40e: make use of i40e_vc_disable_vfJacob Keller2017-10-021-2/+1
| * i40e: drop i40e_pf *pf from i40e_vc_disable_vf()Jacob Keller2017-10-021-4/+3
| * i40e: don't hold spinlock while resetting VFJacob Keller2017-10-021-4/+32