summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: flow_offload: rename TC_BLOCK_{UN}BIND to FLOW_BLOCK_{UN}BINDPablo Neira Ayuso2019-07-099-28/+27
* net: flow_offload: add flow_block_cb_setup_simple()Pablo Neira Ayuso2019-07-0917-317/+117
* Merge branch 'net-hisilicon-Add-support-for-HI13X1-to-hip04_eth'David S. Miller2019-07-093-23/+136
|\
| * net: hisilicon: Add an tx_desc to adapt HI13X1_GMACJiangfeng Xiao2019-07-091-3/+31
| * net: hisilicon: Add an rx_desc to adapt HI13X1_GMACJiangfeng Xiao2019-07-091-0/+9
| * net: hisilicon: Offset buf address to adapt HI13X1_GMACJiangfeng Xiao2019-07-091-3/+17
| * net: hisilicon: Add group field to adapt HI13X1_GMACJiangfeng Xiao2019-07-091-3/+5
| * net: hisilicon: dt-bindings: Add an field of port-handleJiangfeng Xiao2019-07-091-3/+4
| * net: hisilicon: HI13X1_GMAX need dreq reset at firstJiangfeng Xiao2019-07-091-0/+24
| * net: hisilicon: HI13X1_GMAX skip write LOCAL_PAGE_REGJiangfeng Xiao2019-07-091-0/+2
| * net: hisilicon: Cleanup for cast to restricted __be32Jiangfeng Xiao2019-07-091-2/+2
| * net: hisilicon: Cleanup for got restricted __be32Jiangfeng Xiao2019-07-091-4/+4
| * net: hisilicon: Add support for HI13X1 to hip04_ethJiangfeng Xiao2019-07-092-7/+40
|/
* Merge branch 'stmmac-hash-table'David S. Miller2019-07-095-26/+43
|\
| * net: stmmac: add support for hash table size 128/256 in dwmac4Biao Huang2019-07-095-25/+42
| * net: stmmac: dwmac4: mac address array boudary violation issueBiao Huang2019-07-091-1/+1
|/
* Merge branch 'tc-testing-Add-plugin-for-simple-traffic-generation'David S. Miller2019-07-094-8/+155
|\
| * tc-testing: introduce scapyPlugin for basic trafficLucas Bates2019-07-092-0/+148
| * tc-testing: Allow tdc plugins to see test case dataLucas Bates2019-07-092-8/+7
|/
* net: dsa: vsc73xx: fix NET_DSA and OF dependenciesArnd Bergmann2019-07-091-0/+4
* Merge branch 'Armada-8040-SoC-in-orion-mdio-hang'David S. Miller2019-07-092-2/+11
|\
| * net: mvmdio: defer probe of orion-mdio if a clock is not readyJosua Mayer2019-07-091-0/+5
| * net: mvmdio: print warning when orion-mdio has too many clocksJosua Mayer2019-07-091-0/+4
| * net: mvmdio: allow up to four clocks to be specified for orion-mdioJosua Mayer2019-07-091-1/+1
| * dt-bindings: allow up to four clocks for orion-mdioJosua Mayer2019-07-091-1/+1
|/
* net: netsec: start using buffers if page_pool registration succeededIlias Apalodimas2019-07-091-8/+9
* Merge branch 'net-stmmac-Some-improvements-and-a-fix'David S. Miller2019-07-0912-172/+114
|\
| * net: stmmac: Introducing support for Page PoolJose Abreu2019-07-093-144/+70
| * net: stmmac: Fix descriptors address being in > 32 bits address spaceJose Abreu2019-07-097-22/+26
| * net: stmmac: Implement RX Coalesce Frames settingJose Abreu2019-07-094-8/+20
|/
* bnxt_en: Add page_pool_destroy() during RX ring cleanup.Michael Chan2019-07-091-6/+2
* Merge branch 'net-sched-Introduce-tc-connection-tracking'David S. Miller2019-07-0913-5/+1632
|\
| * tc-tests: Add tc action ct testsPaul Blakey2019-07-091-0/+314
| * net/sched: cls_flower: Add matching on conntrack infoPaul Blakey2019-07-092-5/+138
| * net/flow_dissector: add connection tracking dissectionPaul Blakey2019-07-093-0/+69
| * net/sched: Introduce action ctPaul Blakey2019-07-098-0/+1111
|/
* Merge branch 'devlink-Introduce-PCI-PF-VF-ports-and-attributes'David S. Miller2019-07-095-53/+232
|\
| * net/mlx5e: Register devlink ports for physical link, PCI PF, VFsParav Pandit2019-07-092-31/+78
| * devlink: Introduce PCI VF port flavour and port attributeParav Pandit2019-07-093-0/+54
| * devlink: Introduce PCI PF port flavour and port attributeParav Pandit2019-07-093-0/+47
| * devlink: Return physical port fields only for applicable port flavoursParav Pandit2019-07-091-0/+4
| * devlink: Refactor physical port attributesParav Pandit2019-07-092-22/+49
|/
* Merge branch 'nfp-tls-fixes-for-initial-TLS-support'David S. Miller2019-07-0910-50/+143
|\
| * net/tls: fix socket wmem accounting on fallback with netemJakub Kicinski2019-07-091-0/+4
| * nfp: tls: undo TLS sequence tracking when dropping the frameJakub Kicinski2019-07-091-0/+23
| * nfp: tls: avoid one of the ifdefs for TLSJakub Kicinski2019-07-091-4/+2
| * net/tls: add missing prot info initJakub Kicinski2019-07-091-0/+2
| * nfp: tls: don't leave key material in freed FW cmsg skbsJakub Kicinski2019-07-091-1/+15
| * net/tls: don't clear TX resync flag on errorDirk van der Merwe2019-07-094-12/+23
| * nfp: tls: count TSO segments separately for the TLS offloadJakub Kicinski2019-07-091-1/+4