drivers/net/benet/be.h | 14 ++++++++++++++ drivers/net/benet/be_main.c | 10 +++++----- net/core/gen_estimator.c | 13 +++++++------ net/core/skbuff.c | 2 +- net/ipv4/Kconfig | 2 +- net/ipv4/tcp.c | 5 ++++- net/sched/sch_teql.c | 5 +++-- 7 files changed, 35 insertions(+), 16 deletions(-)
New commits: commit bc8a5397433e4effbaddfa7e462d10b3c060cabb Author: Frans Pop <[email protected]> Date: Mon May 18 21:48:38 2009 -0700 ipv4: make default for INET_LRO consistent with help text Commit e81963b1 ("ipv4: Make INET_LRO a bool instead of tristate.") changed this config from tristate to bool. Add default so that it is consistent with the help text. Signed-off-by: Frans Pop <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 995b337952cdf7e05d288eede580257b632a8343 Author: Thomas Chenault <[email protected]> Date: Mon May 18 21:43:27 2009 -0700 net: fix skb_seq_read returning wrong offset/length for page frag data When called with a consumed value that is less than skb_headlen(skb) bytes into a page frag, skb_seq_read() incorrectly returns an offset/length relative to skb->data. Ensure that data which should come from a page frag does. Signed-off-by: Thomas Chenault <[email protected]> Tested-by: Shyam Iyer <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 511e11e396dc596825ce04d53d7f6d579404bc01 Author: Eric Dumazet <[email protected]> Date: Mon May 18 19:26:37 2009 -0700 pkt_sched: gen_estimator: use 64 bit intermediate counters for bps gen_estimator can overflow bps (bytes per second) with Gb links, while it was designed with a u32 API, with a theorical limit of 34360Mbit (2^32 bytes) Using 64 bit intermediate avbps/brate counters can allow us to reach this theorical limit. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: Jarek Poplawski <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit c4ca2374312b4de819dd700e72a68395eddb5fcb Author: Ajit Khaparde <[email protected]> Date: Mon May 18 15:38:55 2009 -0700 be2net: add two new pci device ids to pci device table Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit c0f84d0d4be3f7d818b4ffb04d27f9bae64397f0 Author: Eric Dumazet <[email protected]> Date: Mon May 18 15:12:31 2009 -0700 sch_teql: should not dereference skb after ndo_start_xmit() It is illegal to dereference a skb after a successful ndo_start_xmit() call. We must store skb length in a local variable instead. Bug was introduced in 2.6.27 by commit 0abf77e55a2459aa9905be4b226e4729d5b4f0cb (net_sched: Add accessor function for packet length for qdiscs) Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 775273131810caa41dfc7f9e552ea5d8508caf40 Author: Ilpo Järvinen <[email protected]> Date: Sun May 10 20:32:34 2009 +0000 tcp: fix MSG_PEEK race check Commit 518a09ef11 (tcp: Fix recvmsg MSG_PEEK influence of blocking behavior) lets the loop run longer than the race check did previously expect, so we need to be more careful with this check and consider the work we have been doing. I tried my best to deal with urg hole madness too which happens here: if (!sock_flag(sk, SOCK_URGINLINE)) { ++*seq; ... by using additional offset by one but I certainly have very little interest in testing that part. Signed-off-by: Ilpo Järvinen <[email protected]> Tested-by: Frans Pop <[email protected]> Tested-by: Ian Zimmermann <[email protected]> Signed-off-by: David S. Miller <[email protected]> http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=bc8a5397433e4effbaddfa7e462d10b3c060cabb http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=995b337952cdf7e05d288eede580257b632a8343 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=511e11e396dc596825ce04d53d7f6d579404bc01 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=c4ca2374312b4de819dd700e72a68395eddb5fcb http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=c0f84d0d4be3f7d818b4ffb04d27f9bae64397f0 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=775273131810caa41dfc7f9e552ea5d8508caf40
_______________________________________________ svn mailing list [email protected] http://mailman.vyatta.com/mailman/listinfo/svn
