[GIT]: Networking

David Miller
2008-07-25T23:55:52Z

A fix for a lockdep problem reported by Ingo, and a cure
for order-5 page allocations that can be triggered by
IPCOMP decompression from Herbert Xu.

Please pull, thanks a lot!

The following changes since commit f867e6af94239a04ec23aeec2fcda5aa58e41db7:
Jarek Poplawski (1):
pkt_sched: sch_sfq: dump a real number of flows

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

David S. Miller (1):
pkt_sched: Fix locking in shutdown_scheduler_queue()

Herbert Xu (2):
ipsec: ipcomp - Merge IPComp implementations
ipsec: ipcomp - Decompress into frags if necessary

include/net/ipcomp.h | 6 +
net/ipv4/Kconfig | 4 +-
net/ipv4/ipcomp.c | 315 +-------------------------------------
net/ipv6/Kconfig | 4 +-
net/ipv6/ipcomp6.c | 298 +-----------------------------------
net/sched/sch_generic.c | 4 +-
net/xfrm/Kconfig | 6 +
net/xfrm/Makefile | 1 +
net/xfrm/xfrm_ipcomp.c | 385 +++++++++++++++++++++++++++++++++++++++++++++++
9 files changed, 415 insertions(+), 608 deletions(-)
create mode 100644 net/xfrm/xfrm_ipcomp.c