summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into net-nextnet-nextStephen Hemminger2017-12-145-4/+10
|\
| * tc: fix command "tc actions del" hang issueChris Mi2017-12-141-1/+1
| * tc: fix json array closingJiri Pirko2017-12-131-1/+1
| * ip: add vxcan to help textOliver Hartkopp2017-12-132-2/+2
| * Show 'external' link mode in outputPhil Dibowitz2017-12-132-0/+6
* | gre6: add collect metadata supportWilliam Tu2017-12-142-20/+52
* | iplink: add definitions for GSO_MAXStephen Hemminger2017-12-141-4/+15
* | iplink: validate maximum gso_max_sizeSolio Sarabia2017-12-142-2/+3
* | Merge branch 'master' into net-nextStephen Hemminger2017-12-122-275/+622
|\ \ | |/
| * tc: bash-completion: add missing 'classid' keywordDavide Caratti2017-12-121-1/+1
| * ss: Implement automatic column width calculationStefano Brivio2017-12-121-68/+120
| * ss: Buffer raw fields first, then render them as a tableStefano Brivio2017-12-121-46/+225
| * ss: Introduce columns lightweight abstractionStefano Brivio2017-12-121-93/+198
| * ss: Replace printf() calls for "main" output by calls to helperStefano Brivio2017-12-121-194/+205
* | Merge branch 'master' into net-nextStephen Hemminger2017-12-111-1/+0
|\ \ | |/
| * ss: remove duplicate assignmentRoman Mashak2017-12-111-1/+0
* | uapi: tun add eBPF based queue selection methodStephen Hemminger2017-12-111-0/+1
* | uapi: add access to snd_cwnd and other sock_opsStephen Hemminger2017-12-111-0/+6
* | iplink: allow configuring GSO max valuesStephen Hemminger2017-12-082-1/+31
* | Merge branch 'master' into net-nextStephen Hemminger2017-12-0817-9/+26
|\ \ | |/
| * tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control()Michal Privoznik2017-12-0814-7/+19
| * ss: print tcpi_rcv_ssthreshWei Wang2017-12-081-0/+4
| * update headers from 4.15-rc2Stephen Hemminger2017-12-051-0/+1
| * man: tc-csum.8: Fix inconsistency in example descriptionPhil Sutter2017-11-291-2/+2
* | update bpf header from net-nextStephen Hemminger2017-11-281-7/+1
* | Merge branch 'master' into net-nextStephen Hemminger2017-11-28144-589/+1134
|\ \ | |/
| * man: add -json option to tc manpageJiri Pirko2017-11-281-1/+6
| * vxlan: Make id optional when modifying a linkRobert Shearman2017-11-281-2/+3
| * gre: Fix ttl inherit optionRobert Shearman2017-11-281-1/+2
| * link_gre6: Detect invalid encaplimit valuesPhil Sutter2017-11-281-1/+1
| * m_mirred: style cleanupsStephen Hemminger2017-11-261-36/+38
| * m_gact: whitespace cleanupStephen Hemminger2017-11-261-7/+10
| * m_action: style cleanupStephen Hemminger2017-11-261-32/+45
| * m_vlan: style cleanupsStephen Hemminger2017-11-261-37/+34
| * tc: jsonify vlan actionJiri Pirko2017-11-261-14/+12
| * tc: jsonify mirred actionJiri Pirko2017-11-261-6/+40
| * tc: jsonify gact actionJiri Pirko2017-11-261-7/+11
| * tc: jsonify actions coreJiri Pirko2017-11-262-17/+39
| * tc: jsonify matchall filterJiri Pirko2017-11-261-6/+6
| * tc: jsonify flower filterJiri Pirko2017-11-261-118/+169
| * tc: jsonify filter coreJiri Pirko2017-11-261-17/+30
| * tc: jsonify htb qdiscJiri Pirko2017-11-261-7/+13
| * tc: jsonify fq_codel qdiscJiri Pirko2017-11-261-9/+16
| * tc: jsonify stats2Jiri Pirko2017-11-261-9/+23
| * tc: jsonify qdisc coreJiri Pirko2017-11-263-21/+37
| * tc: remove action cookie len from printoutJiri Pirko2017-11-261-1/+1
| * tc: move action cookie print out of the stats ifJiri Pirko2017-11-261-9/+8
| * iplink: communicate ifindex for xdp offloadJakub Kicinski2017-11-263-6/+12
| * f_bpf: communicate ifindex for eBPF offloadJakub Kicinski2017-11-261-1/+13
| * tc_filter: resolve device name before parsing filterJakub Kicinski2017-11-261-26/+24