summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2016-09-251-1/+3
|\
| * Bluetooth: Fix not updating scan rsp when adv offMichał Narajowski2016-09-221-1/+1
| * Bluetooth: Fix NULL pointer dereference in mgmt contextArek Lichwa2016-09-221-0/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Pablo Neira Ayuso2016-09-25243-5889/+10530
|\ \
| * \ Merge tag 'rxrpc-rewrite-20160924' of git://git.kernel.org/pub/scm/linux/kern...David S. Miller2016-09-259-38/+418
| |\ \
| | * | rxrpc: Implement slow-startDavid Howells2016-09-248-13/+294
| | * | rxrpc: Schedule an ACK if the reply to a client call appears overdueDavid Howells2016-09-244-0/+13
| | * | rxrpc: Generate a summary of the ACK state for later useDavid Howells2016-09-242-11/+48
| | * | rxrpc: Delay the resend timer to allow for nsec->jiffies conv errorDavid Howells2016-09-241-2/+8
| | * | rxrpc: Reinitialise the call ACK and timer state for client reply phaseDavid Howells2016-09-243-0/+11
| | * | rxrpc: Include the last reply DATA serial number in the final ACKDavid Howells2016-09-241-3/+3
| | * | rxrpc: Send an immediate ACK if we fill in a holeDavid Howells2016-09-241-1/+9
| | * | rxrpc: Send an ACK after every few DATA packets we receiveDavid Howells2016-09-244-9/+33
| * | | gre: use nla_get_be32() to extract flowinfoLance Richardson2016-09-241-1/+1
| |/ /
| * | Merge tag 'rxrpc-rewrite-20160923' of git://git.kernel.org/pub/scm/linux/kern...David S. Miller2016-09-249-118/+239
| |\ \
| | * | rxrpc: Add a tracepoint to log which packets will be retransmittedDavid Howells2016-09-231-0/+2
| | * | rxrpc: Add tracepoint for ACK proposalDavid Howells2016-09-236-28/+73
| | * | rxrpc: Add a tracepoint to log injected Rx packet lossDavid Howells2016-09-231-6/+5
| | * | rxrpc: Add data Tx tracepoint and adjust Tx ACK tracepointDavid Howells2016-09-232-4/+6
| | * | rxrpc: Add a tracepoint for the call timerDavid Howells2016-09-235-7/+29
| | * | rxrpc: Don't call the tx_ack tracepoint if don't generate an ACKDavid Howells2016-09-231-15/+11
| | * | rxrpc: Pass the last Tx packet marker in the annotation bufferDavid Howells2016-09-234-45/+81
| | * | rxrpc: Fix call timerDavid Howells2016-09-232-13/+16
| | * | rxrpc: Fix accidental cancellation of scheduled resend by ACK parserDavid Howells2016-09-231-0/+2
| | * | rxrpc: Need to start the resend timer on initial transmissionDavid Howells2016-09-233-1/+11
| | * | rxrpc: Use before_eq() and friends to compare serial numbersDavid Howells2016-09-231-1/+1
| | * | rxrpc: Should be using ktime_add_ms() not ktime_add_ns()David Howells2016-09-231-1/+1
| | * | rxrpc: Make sure sendmsg() is woken on call completionDavid Howells2016-09-231-0/+1
| | * | rxrpc: Don't send an ACK at the end of service call response transmissionDavid Howells2016-09-231-2/+0
| | * | rxrpc: Preset timestamp on Tx sk_buffsDavid Howells2016-09-231-0/+5
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2016-09-241-2/+2
| |\ \ \
| | * | | xfrm: state lookup can be locklessFlorian Westphal2016-09-211-2/+2
| * | | | net: Update API for VF vlan protocol 802.1ad supportMoshe Shemesh2016-09-241-15/+65
| * | | | bpf: add helper to invalidate hashDaniel Borkmann2016-09-231-0/+18
| * | | | bpf: use bpf_get_smp_processor_id_proto instead of raw oneDaniel Borkmann2016-09-231-0/+2
| * | | | bpf: use skb_to_full_sk helper in bpf_skb_under_cgroupDaniel Borkmann2016-09-231-1/+1
| * | | | net: dsa: add port fast ageingVivien Didelot2016-09-231-0/+18
| * | | | net: dsa: add port STP state helperVivien Didelot2016-09-231-7/+10
| | |/ / | |/| |
| * | | net_sched: sch_fq: account for schedule/timers driftsEric Dumazet2016-09-231-3/+18
| * | | sctp: fix the handling of SACK Gap Ack blocksMarcelo Ricardo Leitner2016-09-231-5/+6
| * | | net_sched: check NULL on error path in route4_change()WANG Cong2016-09-231-1/+2
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-09-2335-111/+250
| |\ \ \
| | * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-09-2230-94/+209
| | |\ \ \
| | | * | | tcp: properly account Fast Open SYN-ACK retransYuchung Cheng2016-09-223-1/+4
| | | * | | tcp: fix under-accounting retransmit SNMP countersYuchung Cheng2016-09-221-1/+1
| | | * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2016-09-226-14/+48
| | | |\ \ \
| | | | * | | vti6: fix input pathNicolas Dichtel2016-09-213-9/+13
| | | | * | | xfrm: Fix memory leak of aead algorithm nameIlan Tayari2016-09-191-0/+1
| | | | * | | vti: use right inner_mode for inbound inter address family policy checksthomas.zeitlhofer+lkml@ze-it.at2016-09-092-2/+28
| | | | * | | xfrm_user: propagate sec ctx allocation errorsMathias Krause2016-09-091-3/+6
OpenPOWER on IntegriCloud