From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <noreply@github.com>
Received: from smtp1-ext.rs.github.com (smtp1-ext.rs.github.com
	[207.97.227.250])
	by huchra.bufferbloat.net (Postfix) with ESMTP id B5191201B52
	for <cerowrt-commits@lists.bufferbloat.net>;
	Thu,  9 Aug 2012 15:51:01 -0700 (PDT)
Received: from github.com (sh2.rs.github.com [50.57.128.197])
	by smtp1-ext.rs.github.com (Postfix) with ESMTP id 8795A43A62
	for <cerowrt-commits@lists.bufferbloat.net>;
	Thu,  9 Aug 2012 15:51:00 -0700 (PDT)
Date: Thu, 09 Aug 2012 15:51:00 -0700
From: GitHub <noreply@github.com>
To: cerowrt-commits@lists.bufferbloat.net
Message-ID: <50243ed47ade6_4f70e14aec289df@sh2.rs.github.com.mail>
Subject: [dtaht/ns-3-dev] 18c329: Rebase codel and fq_codel work on top of
	current n...
Mime-Version: 1.0
Content-Type: multipart/mixed;
	boundary="--==_mimepart_50243ed478696_4f70e14aec287a2";
	charset=UTF-8
Content-Transfer-Encoding: 7bit
X-BeenThere: cerowrt-commits@lists.bufferbloat.net
X-Mailman-Version: 2.1.13
Precedence: list
Reply-To: GitHub <noreply@github.com>
List-Id: Development commits for the cerowrt project
	<cerowrt-commits.lists.bufferbloat.net>
List-Unsubscribe: <https://lists.bufferbloat.net/options/cerowrt-commits>,
	<mailto:cerowrt-commits-request@lists.bufferbloat.net?subject=unsubscribe>
List-Archive: <https://lists.bufferbloat.net/pipermail/cerowrt-commits>
List-Post: <mailto:cerowrt-commits@lists.bufferbloat.net>
List-Help: <mailto:cerowrt-commits-request@lists.bufferbloat.net?subject=help>
List-Subscribe: <https://lists.bufferbloat.net/listinfo/cerowrt-commits>,
	<mailto:cerowrt-commits-request@lists.bufferbloat.net?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2012 22:51:02 -0000



----==_mimepart_50243ed478696_4f70e14aec287a2
Date: Thu, 09 Aug 2012 15:51:00 -0700
Mime-Version: 1.0
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-ID: <50243ed479c99_4f70e14aec2884e@sh2.rs.github.com.mail>

  Branch: refs/heads/master
  Home:   https://github.com/dtaht/ns-3-dev
  Commit: 18c32942c0873f8f6a9d627f54fbe575399c9a8d
      https://github.com/dtaht/ns-3-dev/commit/18c32942c0873f8f6a9d627f54fbe575399c9a8d
  Author: Dave Taht <dave.taht@bufferbloat.net>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    A scratch/tcp-qfp.cc
    A src/core/model/linux-list.h
    M src/core/wscript
    A src/internet/model/fq_codel-queue.cc
    A src/internet/model/fq_codel-queue.h
    A src/internet/model/sfq-queue.cc
    A src/internet/model/sfq-queue.h
    M src/internet/model/tcp-socket-base.cc
    M src/internet/wscript
    A src/network/utils/codel-queue.cc
    A src/network/utils/codel-queue.h
    M src/network/wscript
    M src/point-to-point/model/point-to-point-net-device.cc

  Log Message:
  -----------
  Rebase codel and fq_codel work on top of current ns3 codebase

There were issues in the previous work making it difficult to move
forward. Hopefully with hg-git installed we can go back and forth.

This commit leaves the default queue depth at 1000 packets
and has setting the queue mode commented out.




----==_mimepart_50243ed478696_4f70e14aec287a2--