kernel/git/stable/linux-stable.git/net/sched, branch linux-2.6.39.y

sch_sfq: avoid giving spurious NET_XMIT_CN signals

2011-06-03T00:31:57+00:00

[ Upstream commit 8efa885406359af300d46910642b50ca82c0fe47 ] While chasing a possible net_sched bug, I found that IP fragments have litle chance to pass a congestioned SFQ qdisc : - Say SFQ qdisc is full because one flow is non responsive. - ip_fragment() wants to send two fragments belonging to an idle flow. - sfq_enqueue() queues first packet, but see queue limit reached : - sfq_enqueue() drops one packet from 'big consumer', and returns NET_XMIT_CN. - ip_fragment() cancel remaining fragments. This patch restores fairness, making sure we return NET_XMIT_CN only if we dropped a packet from the same flow. Signed-off-by: Eric Dumazet CC: Patrick McHardy CC: Jarek Poplawski CC: Jamal Hadi Salim CC: Stephen Hemminger Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman

sch_sfq: fix peek() implementation

2011-06-03T00:31:56+00:00

[ Upstream commit 07bd8df5df4369487812bf85a237322ff3569b77 ] Since commit eeaeb068f139 (sch_sfq: allow big packets and be fair), sfq_peek() can return a different skb that would be normally dequeued by sfq_dequeue() [ if current slot->allot is negative ] Use generic qdisc_peek_dequeued() instead of custom implementation, to get consistent result. Signed-off-by: Eric Dumazet CC: Jarek Poplawski CC: Patrick McHardy CC: Jesper Dangaard Brouer Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman

Fix common misspellings

2011-03-31T14:26:23+00:00

Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi

ipv4: Remove flowi from struct rtable.

2011-03-05T05:55:31+00:00

The only necessary parts are the src/dst addresses, the interface indexes, the TOS, and the mark. The rest is unnecessary bloat, which amounts to nearly 50 bytes on 64-bit. Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-03-04T05:27:42+00:00

Conflicts: drivers/net/bnx2x/bnx2x.h

net_sched: reduce fifo qdisc size

2011-03-03T19:10:02+00:00

Because of various alignements [SLUB / qdisc], we use 512 bytes of memory for one {p|b}fifo qdisc, instead of 256 bytes on 64bit arches and 192 bytes on 32bit ones. Move the "u32 limit" inside "struct Qdisc" (no impact on other qdiscs) Change qdisc_alloc(), first trying a regular allocation before an oversized one. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller

sched: protocol only needed when CONFIG_NET_CLS_ACT is enabled

2011-02-25T22:00:23+00:00

Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller

sch_netem: Need to include vmalloc.h

2011-02-25T06:48:13+00:00

Signed-off-by: David S. Miller

sch_choke: add choke_skb_cb

2011-02-25T06:11:57+00:00

Better document choke skb->cb[] use, like we did in netem and sfb This adds a compile time check to make sure we dont exhaust skb->cb[] space. Signed-off-by: Eric Dumazet CC: Stephen Hemminger CC: Patrick McHardy Signed-off-by: David S. Miller

netem: update version and cleanup

2011-02-25T06:11:56+00:00

Get rid of debug message that are not useful, and enable the log messages in case of error. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller