summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bnxt_en: Add page_pool_destroy() during RX ring cleanup.Michael Chan2019-07-091-6/+2Star
* 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/+2Star
| * 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
| * nfp: ccm: increase message limitsDirk van der Merwe2019-07-091-3/+3
| * nfp: tls: use unique connection ids instead of 4-tuple for TXJakub Kicinski2019-07-093-14/+34
| * nfp: tls: move setting ipver_vlan to a helperJakub Kicinski2019-07-091-6/+10
| * nfp: tls: ignore queue limits for delete commandsJakub Kicinski2019-07-093-10/+24
|/
* sctp: remove rcu_read_lock from sctp_bind_addr_stateXin Long2019-07-091-9/+4Star
* Merge branch 'sctp-tidyup'David S. Miller2019-07-096-46/+39Star
|\
| * sctp: rename sp strm_interleave to ep intl_enableXin Long2019-07-093-7/+7
| * sctp: rename asoc intl_enable to asoc peer.intl_capableXin Long2019-07-095-22/+23
| * sctp: remove prsctp_enable from asocXin Long2019-07-094-8/+6Star
| * sctp: remove reconf_enable from asocXin Long2019-07-094-11/+5Star
|/
* net: phy: Make use of linkmode_mod_bit helperFuqian Huang2019-07-091-12/+4Star
* Merge branch 'Add-MPLS-actions-to-TC'David S. Miller2019-07-0911-73/+1754
|\
| * tc-tests: actions: add MPLS testsJohn Hurley2019-07-092-0/+1089
| * net: sched: add mpls manipulation actions to TCJohn Hurley2019-07-098-1/+514
| * net: core: add MPLS update core helper and use in OvSJohn Hurley2019-07-093-10/+37
| * net: core: move pop MPLS functionality from OvS to core helperJohn Hurley2019-07-093-35/+45
| * net: core: move push MPLS functionality from OvS to core helperJohn Hurley2019-07-093-27/+69
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2019-07-09129-899/+1265
|\
| * tcp: Reset bytes_acked and bytes_received when disconnectingChristoph Paasch2019-07-091-0/+2
| * selftests: txring_overwrite: fix incorrect test of mmap() return valueFrank de Brabander2019-07-091-1/+1
| * nfc: fix potential illegal memory accessYang Wei2019-07-081-1/+1
| * net: stmmac: Re-work the queue selection for TSO packetsJose Abreu2019-07-081-10/+18
| * net: bpfilter: print umh messages to /dev/kmsgGary Lin2019-07-081-1/+1
| * net: nixge: Fix misuse of strlcpyJoe Perches2019-07-081-1/+1
| * net: ethernet: sun4i-emac: Fix misuse of strlcpyJoe Perches2019-07-081-2/+2
| * Merge branch 'gtp-fix-several-bugs'David S. Miller2019-07-081-8/+29
| |\
| | * gtp: add missing gtp_encap_disable_sock() in gtp_encap_enable()Taehee Yoo2019-07-081-1/+6
| | * gtp: fix use-after-free in gtp_newlink()Taehee Yoo2019-07-081-1/+1
| | * gtp: fix Illegal context switch in RCU read-side critical section.Taehee Yoo2019-07-081-1/+1
| | * gtp: remove duplicate code in gtp_dellink()Taehee Yoo2019-07-081-1/+0Star