summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ipv6: check fn before doing FIB6_SUBTREE(fn)Wei Wang2017-10-161-4/+7
* bpf: Add -target to clang switch while cross compiling.Abhijit Ayarekar2017-10-161-2/+3
* Merge branch 'sched-tp_q-remove'David S. Miller2017-10-1623-69/+127
|\
| * net: sched: propagate q and parent from caller down to tcf_fill_nodeJiri Pirko2017-10-161-20/+35
| * net: sched: use tcf_block_q helper to get q pointer for sch_tree_lockJiri Pirko2017-10-162-5/+4
| * net: sched: tcindex, fw, flow: use tcf_block_q helper to get struct QdiscJiri Pirko2017-10-163-4/+13
| * net: sched: cls_u32: use block instead of q in tc_u_commonJiri Pirko2017-10-161-8/+4
| * net: sched: ematch: obtain net pointer from blocksJiri Pirko2017-10-161-1/+1
| * net: sched: teach tcf_bind/unbind_filter to use block->qJiri Pirko2017-10-161-10/+17
| * net: sched: introduce tcf_block_q and tcf_block_dev helpersJiri Pirko2017-10-161-0/+21
| * net: sched: store net pointer in block and introduce qdisc_net helperJiri Pirko2017-10-163-0/+9
| * net: sched: store Qdisc pointer in struct blockJiri Pirko2017-10-1616-21/+23
|/
* mqprio: Reserve last 32 classid values for HW traffic classes and misc IDsAlexander Duyck2017-10-162-33/+47
* Merge tag 'mlx5-updates-2017-10-11' of git://git.kernel.org/pub/scm/linux/ker...David S. Miller2017-10-1624-796/+1437
|\
| * net/mlx5e: IPoIB, Modify rdma netdev allocate and free to support PKEYAlex Vesker2017-10-143-18/+36
| * net/mlx5e: IPoIB, Add PKEY child interface ethtool opsAlex Vesker2017-10-143-2/+8
| * net/mlx5e: IPoIB, Add PKEY child interface ndosAlex Vesker2017-10-143-7/+144
| * net/mlx5e: IPoIB, Add PKEY child interface nic profileAlex Vesker2017-10-143-6/+102
| * net/mlx5e: IPoIB, Use hash-table to map between QPN to child netdevAlex Vesker2017-10-145-2/+184
| * net/mlx5e: IPoIB, Support for setting PKEY index to underlay QPAlex Vesker2017-10-142-0/+10
| * IB/ipoib: Add ability to set PKEY index to lower device driverAlex Vesker2017-10-141-2/+6
| * IB/ipoib: Grab rtnl lock on heavy flush when calling ndo_open/stopAlex Vesker2017-10-141-1/+6
| * net/mlx5: Support for attaching multiple underlay QPs to root flow tableAlex Vesker2017-10-145-54/+171
| * net/mlx5e: IPoIB, Move underlay QP init/uninit to separate functionsAlex Vesker2017-10-141-38/+70
| * net/mlx5: PTP code migration to driver core sectionFeras Daoud2017-10-1412-382/+416
| * net/mlx5: File renaming towards ptp core implementationFeras Daoud2017-10-143-3/+3
* | Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2017-10-1413-192/+1510
|\ \
| * | i40e/i40evf: don't trust VF to reset itselfAlan Brady2017-10-133-8/+12
| * | i40e: fix link reportingAlan Brady2017-10-131-1/+6
| * | i40e: make const array patterns static, reduces object code sizeColin Ian King2017-10-131-1/+3
| * | i40e: Add support setting TC max bandwidth ratesAmritha Nambiar2017-10-132-9/+93
| * | i40e: Refactor VF BW rate limitingAmritha Nambiar2017-10-133-43/+71
| * | i40e: Enable 'channel' mode in mqprio for TC configsAmritha Nambiar2017-10-133-106/+362
| * | i40e: Add infrastructure for queue channel supportAmritha Nambiar2017-10-133-9/+743
| * | i40e: Add macro for PF reset bitAmritha Nambiar2017-10-134-10/+9
| * | mqprio: Introduce new hardware offload mode and shaper in mqprioAmritha Nambiar2017-10-133-9/+215
* | | Merge branch 'tc-testing-updates'David S. Miller2017-10-149-1169/+2097
|\ \ \
| * | | tc-testing: fix the -l argument bug in tdc.pyLucas Bates2017-10-141-4/+4
| * | | tc-testing: Add test cases for police and skbmodLucas Bates2017-10-142-0/+899
| * | | tc-testing: Split test case files into smaller chunksLucas Bates2017-10-146-1212/+1194
| * | | tc-testing: Add test cases for flushing actionsLucas Bates2017-10-141-1/+48
|/ / /
* | | Merge branch 'macvlan-cleanups'David S. Miller2017-10-141-2/+4
|\ \ \
| * | | macvlan: Only update pkt_type if destination MAC address matchesAlexander Duyck2017-10-141-1/+3
| * | | macvlan: Only deliver one copy of the frame to the macvlan interfaceAlexander Duyck2017-10-141-1/+1
|/ / /
* | | tcp: add a tracepoint for tcp retransmissionCong Wang2017-10-143-0/+72
* | | net_sched: fix a compile warning in act_ifeCong Wang2017-10-141-0/+2
* | | Merge branch 'hv_netvsc-Add-init-of-send-table-and-var-renames'David S. Miller2017-10-144-10/+13
|\ \ \
| * | | hv_netvsc: Add initialization of tx_table in netvsc_device_add()Haiyang Zhang2017-10-141-0/+3
| * | | hv_netvsc: Rename tx_send_table to tx_tableHaiyang Zhang2017-10-143-4/+4
| * | | hv_netvsc: Rename ind_table to rx_tableHaiyang Zhang2017-10-143-6/+6
|/ / /