From: David S. Miller <davem@davemloft.net>
Date: Mon, 29 Sep 2014 04:13:17 +0000 (-0400)
Subject: Merge branch 'dctcp'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a11238ec28d40f56f8b939f6f125694dba3adb70;p=linux-beck.git

Merge branch 'dctcp'

Daniel Borkmann says:

====================
net: tcp: DCTCP congestion control algorithm

This patch series adds support for the DataCenter TCP (DCTCP) congestion
control algorithm. Please see individual patches for the details.

The last patch adds DCTCP as a congestion control module, and previous
ones add needed infrastructure to extend the congestion control framework.

Joint work between Florian Westphal, Daniel Borkmann and Glenn Judd.

v3 -> v2:
 - No changes anywhere, just a resend as requested by Dave
 - Added Stephen's ACK
v1 -> v2:
 - Rebased to latest net-next
 - Addressed Eric's feedback, thanks!
  - Update stale comment wrt. DCTCP ECN usage
  - Don't call INET_ECN_xmit for every packet
 - Add dctcp ss/inetdiag support to expose internal stats to userspace
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

a11238ec28d40f56f8b939f6f125694dba3adb70