CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
#
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
#
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
#
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.27 Kernel Configuration
+# Linux/i386 3.2.20 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
#
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.27 Kernel Configuration
+# Linux/i386 2.6.42.20 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
#
-#usr/local/bin/ccmake
-#usr/local/bin/cmake
-#usr/local/bin/cpack
-#usr/local/bin/ctest
-#usr/local/doc
-#usr/local/doc/cmake-2.6
-#usr/local/doc/cmake-2.6/ccmake.docbook
-#usr/local/doc/cmake-2.6/ccmake.html
-#usr/local/doc/cmake-2.6/ccmake.txt
-#usr/local/doc/cmake-2.6/cmake-commands.html
-#usr/local/doc/cmake-2.6/cmake-commands.txt
-#usr/local/doc/cmake-2.6/cmake-compatcommands.html
-#usr/local/doc/cmake-2.6/cmake-compatcommands.txt
-#usr/local/doc/cmake-2.6/cmake-modules.html
-#usr/local/doc/cmake-2.6/cmake-modules.txt
-#usr/local/doc/cmake-2.6/cmake-policies.html
-#usr/local/doc/cmake-2.6/cmake-policies.txt
-#usr/local/doc/cmake-2.6/cmake-properties.html
-#usr/local/doc/cmake-2.6/cmake-properties.txt
-#usr/local/doc/cmake-2.6/cmake-variables.html
-#usr/local/doc/cmake-2.6/cmake-variables.txt
-#usr/local/doc/cmake-2.6/cmake.docbook
-#usr/local/doc/cmake-2.6/cmake.html
-#usr/local/doc/cmake-2.6/cmake.txt
-#usr/local/doc/cmake-2.6/cpack.docbook
-#usr/local/doc/cmake-2.6/cpack.html
-#usr/local/doc/cmake-2.6/cpack.txt
-#usr/local/doc/cmake-2.6/ctest.docbook
-#usr/local/doc/cmake-2.6/ctest.html
-#usr/local/doc/cmake-2.6/ctest.txt
-#usr/local/man
-#usr/local/man/man1
-#usr/local/man/man1/ccmake.1
-#usr/local/man/man1/cmake.1
-#usr/local/man/man1/cmakecommands.1
-#usr/local/man/man1/cmakecompat.1
-#usr/local/man/man1/cmakemodules.1
-#usr/local/man/man1/cmakepolicies.1
-#usr/local/man/man1/cmakeprops.1
-#usr/local/man/man1/cmakevars.1
-#usr/local/man/man1/cpack.1
-#usr/local/man/man1/ctest.1
-#usr/local/share/cmake-2.6
-#usr/local/share/cmake-2.6/Modules
-#usr/local/share/cmake-2.6/Modules/AddFileDependencies.cmake
-#usr/local/share/cmake-2.6/Modules/BundleUtilities.cmake
-#usr/local/share/cmake-2.6/Modules/CMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeASM-ATTInformation.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeASMCompiler.cmake.in
-#usr/local/share/cmake-2.6/Modules/CMakeASMInformation.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeASM_MASMInformation.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeBackwardCompatibilityC.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeBackwardCompatibilityCXX.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeBorlandFindMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeBuildSettings.cmake.in
-#usr/local/share/cmake-2.6/Modules/CMakeCCompiler.cmake.in
-#usr/local/share/cmake-2.6/Modules/CMakeCCompilerABI.c
-#usr/local/share/cmake-2.6/Modules/CMakeCCompilerId.c.in
-#usr/local/share/cmake-2.6/Modules/CMakeCInformation.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeCXXCompiler.cmake.in
-#usr/local/share/cmake-2.6/Modules/CMakeCXXCompilerABI.cpp
-#usr/local/share/cmake-2.6/Modules/CMakeCXXCompilerId.cpp.in
-#usr/local/share/cmake-2.6/Modules/CMakeCXXInformation.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeCommonLanguageInclude.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeCompilerABI.h
-#usr/local/share/cmake-2.6/Modules/CMakeConfigurableFile.in
-#usr/local/share/cmake-2.6/Modules/CMakeDependentOption.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineASM-ATTCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineASMCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineASM_MASMCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineCCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineCXXCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineCompilerABI.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineCompilerId.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineFortranCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineJavaCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineRCCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeDetermineSystem.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeExportBuildSettings.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeFindBinUtils.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeFindFrameworks.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeFindWMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeFindXCode.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeForceCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeFortranCompiler.cmake.in
-#usr/local/share/cmake-2.6/Modules/CMakeFortranCompilerId.F90.in
-#usr/local/share/cmake-2.6/Modules/CMakeFortranInformation.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeGenericSystem.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeImportBuildSettings.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeJavaCompiler.cmake.in
-#usr/local/share/cmake-2.6/Modules/CMakeJavaInformation.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeMSYSFindMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeMinGWFindMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeNMakeFindMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakePlatformId.h.in
-#usr/local/share/cmake-2.6/Modules/CMakePrintSystemInformation.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeRCCompiler.cmake.in
-#usr/local/share/cmake-2.6/Modules/CMakeRCInformation.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeSystem.cmake.in
-#usr/local/share/cmake-2.6/Modules/CMakeSystemSpecificInformation.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeTestASM-ATTCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeTestASMCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeTestASM_MASMCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeTestCCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeTestCXXCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeTestForFreeVC.cxx
-#usr/local/share/cmake-2.6/Modules/CMakeTestFortranCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeTestGNU.c
-#usr/local/share/cmake-2.6/Modules/CMakeTestJavaCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeTestNMakeCLVersion.c
-#usr/local/share/cmake-2.6/Modules/CMakeTestRCCompiler.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeUnixFindMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeVS6BackwardCompatibility.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeVS6FindMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeVS71FindMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeVS7BackwardCompatibility.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeVS7FindMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeVS8FindMake.cmake
-#usr/local/share/cmake-2.6/Modules/CMakeVS9FindMake.cmake
-#usr/local/share/cmake-2.6/Modules/CPack.DS_Store.in
-#usr/local/share/cmake-2.6/Modules/CPack.Description.plist.in
-#usr/local/share/cmake-2.6/Modules/CPack.Info.plist.in
-#usr/local/share/cmake-2.6/Modules/CPack.OSXScriptLauncher.in
-#usr/local/share/cmake-2.6/Modules/CPack.OSXScriptLauncher.rsrc.in
-#usr/local/share/cmake-2.6/Modules/CPack.OSXX11.Info.plist.in
-#usr/local/share/cmake-2.6/Modules/CPack.OSXX11.main.scpt.in
-#usr/local/share/cmake-2.6/Modules/CPack.RuntimeScript.in
-#usr/local/share/cmake-2.6/Modules/CPack.STGZ_Header.sh.in
-#usr/local/share/cmake-2.6/Modules/CPack.VolumeIcon.icns.in
-#usr/local/share/cmake-2.6/Modules/CPack.background.png.in
-#usr/local/share/cmake-2.6/Modules/CPack.cmake
-#usr/local/share/cmake-2.6/Modules/CPack.distribution.dist.in
-#usr/local/share/cmake-2.6/Modules/CPackDeb.cmake
-#usr/local/share/cmake-2.6/Modules/CPackRPM.cmake
-#usr/local/share/cmake-2.6/Modules/CPackZIP.cmake
-#usr/local/share/cmake-2.6/Modules/CTest.cmake
-#usr/local/share/cmake-2.6/Modules/CTestTargets.cmake
-#usr/local/share/cmake-2.6/Modules/CheckCCompilerFlag.cmake
-#usr/local/share/cmake-2.6/Modules/CheckCSourceCompiles.cmake
-#usr/local/share/cmake-2.6/Modules/CheckCSourceRuns.cmake
-#usr/local/share/cmake-2.6/Modules/CheckCXXCompilerFlag.cmake
-#usr/local/share/cmake-2.6/Modules/CheckCXXSourceCompiles.cmake
-#usr/local/share/cmake-2.6/Modules/CheckCXXSourceRuns.cmake
-#usr/local/share/cmake-2.6/Modules/CheckForPthreads.c
-#usr/local/share/cmake-2.6/Modules/CheckFortranFunctionExists.cmake
-#usr/local/share/cmake-2.6/Modules/CheckFunctionExists.c
-#usr/local/share/cmake-2.6/Modules/CheckFunctionExists.cmake
-#usr/local/share/cmake-2.6/Modules/CheckIncludeFile.c.in
-#usr/local/share/cmake-2.6/Modules/CheckIncludeFile.cmake
-#usr/local/share/cmake-2.6/Modules/CheckIncludeFile.cxx.in
-#usr/local/share/cmake-2.6/Modules/CheckIncludeFileCXX.cmake
-#usr/local/share/cmake-2.6/Modules/CheckIncludeFiles.cmake
-#usr/local/share/cmake-2.6/Modules/CheckLibraryExists.cmake
-#usr/local/share/cmake-2.6/Modules/CheckLibraryExists.lists.in
-#usr/local/share/cmake-2.6/Modules/CheckSizeOf.cmake
-#usr/local/share/cmake-2.6/Modules/CheckStructHasMember.cmake
-#usr/local/share/cmake-2.6/Modules/CheckSymbolExists.cmake
-#usr/local/share/cmake-2.6/Modules/CheckTypeSize.cmake
-#usr/local/share/cmake-2.6/Modules/CheckTypeSizeC.c.in
-#usr/local/share/cmake-2.6/Modules/CheckVariableExists.c
-#usr/local/share/cmake-2.6/Modules/CheckVariableExists.cmake
-#usr/local/share/cmake-2.6/Modules/Dart.cmake
-#usr/local/share/cmake-2.6/Modules/DartConfiguration.tcl.in
-#usr/local/share/cmake-2.6/Modules/Documentation.cmake
-#usr/local/share/cmake-2.6/Modules/DummyCXXFile.cxx
-#usr/local/share/cmake-2.6/Modules/FLTKCompatibility.cmake
-#usr/local/share/cmake-2.6/Modules/FeatureSummary.cmake
-#usr/local/share/cmake-2.6/Modules/FindASPELL.cmake
-#usr/local/share/cmake-2.6/Modules/FindAVIFile.cmake
-#usr/local/share/cmake-2.6/Modules/FindBLAS.cmake
-#usr/local/share/cmake-2.6/Modules/FindBZip2.cmake
-#usr/local/share/cmake-2.6/Modules/FindBoost.cmake
-#usr/local/share/cmake-2.6/Modules/FindCABLE.cmake
-#usr/local/share/cmake-2.6/Modules/FindCURL.cmake
-#usr/local/share/cmake-2.6/Modules/FindCVS.cmake
-#usr/local/share/cmake-2.6/Modules/FindCoin3D.cmake
-#usr/local/share/cmake-2.6/Modules/FindCups.cmake
-#usr/local/share/cmake-2.6/Modules/FindCurses.cmake
-#usr/local/share/cmake-2.6/Modules/FindCxxTest.cmake
-#usr/local/share/cmake-2.6/Modules/FindCygwin.cmake
-#usr/local/share/cmake-2.6/Modules/FindDCMTK.cmake
-#usr/local/share/cmake-2.6/Modules/FindDart.cmake
-#usr/local/share/cmake-2.6/Modules/FindDevIL.cmake
-#usr/local/share/cmake-2.6/Modules/FindDoxygen.cmake
-#usr/local/share/cmake-2.6/Modules/FindEXPAT.cmake
-#usr/local/share/cmake-2.6/Modules/FindFLTK.cmake
-#usr/local/share/cmake-2.6/Modules/FindFLTK2.cmake
-#usr/local/share/cmake-2.6/Modules/FindFreetype.cmake
-#usr/local/share/cmake-2.6/Modules/FindGCCXML.cmake
-#usr/local/share/cmake-2.6/Modules/FindGDAL.cmake
-#usr/local/share/cmake-2.6/Modules/FindGIF.cmake
-#usr/local/share/cmake-2.6/Modules/FindGLU.cmake
-#usr/local/share/cmake-2.6/Modules/FindGLUT.cmake
-#usr/local/share/cmake-2.6/Modules/FindGTK.cmake
-#usr/local/share/cmake-2.6/Modules/FindGettext.cmake
-#usr/local/share/cmake-2.6/Modules/FindGnuplot.cmake
-#usr/local/share/cmake-2.6/Modules/FindHSPELL.cmake
-#usr/local/share/cmake-2.6/Modules/FindHTMLHelp.cmake
-#usr/local/share/cmake-2.6/Modules/FindITK.cmake
-#usr/local/share/cmake-2.6/Modules/FindImageMagick.cmake
-#usr/local/share/cmake-2.6/Modules/FindJNI.cmake
-#usr/local/share/cmake-2.6/Modules/FindJPEG.cmake
-#usr/local/share/cmake-2.6/Modules/FindJasper.cmake
-#usr/local/share/cmake-2.6/Modules/FindJava.cmake
-#usr/local/share/cmake-2.6/Modules/FindKDE3.cmake
-#usr/local/share/cmake-2.6/Modules/FindKDE4.cmake
-#usr/local/share/cmake-2.6/Modules/FindLAPACK.cmake
-#usr/local/share/cmake-2.6/Modules/FindLATEX.cmake
-#usr/local/share/cmake-2.6/Modules/FindLibXml2.cmake
-#usr/local/share/cmake-2.6/Modules/FindLibXslt.cmake
-#usr/local/share/cmake-2.6/Modules/FindLua50.cmake
-#usr/local/share/cmake-2.6/Modules/FindLua51.cmake
-#usr/local/share/cmake-2.6/Modules/FindMFC.cmake
-#usr/local/share/cmake-2.6/Modules/FindMPEG.cmake
-#usr/local/share/cmake-2.6/Modules/FindMPEG2.cmake
-#usr/local/share/cmake-2.6/Modules/FindMPI.cmake
-#usr/local/share/cmake-2.6/Modules/FindMatlab.cmake
-#usr/local/share/cmake-2.6/Modules/FindMotif.cmake
-#usr/local/share/cmake-2.6/Modules/FindOpenAL.cmake
-#usr/local/share/cmake-2.6/Modules/FindOpenGL.cmake
-#usr/local/share/cmake-2.6/Modules/FindOpenMP.cmake
-#usr/local/share/cmake-2.6/Modules/FindOpenSSL.cmake
-#usr/local/share/cmake-2.6/Modules/FindOpenSceneGraph.cmake
-#usr/local/share/cmake-2.6/Modules/FindOpenThreads.cmake
-#usr/local/share/cmake-2.6/Modules/FindPHP4.cmake
-#usr/local/share/cmake-2.6/Modules/FindPNG.cmake
-#usr/local/share/cmake-2.6/Modules/FindPackageHandleStandardArgs.cmake
-#usr/local/share/cmake-2.6/Modules/FindPackageMessage.cmake
-#usr/local/share/cmake-2.6/Modules/FindPerl.cmake
-#usr/local/share/cmake-2.6/Modules/FindPerlLibs.cmake
-#usr/local/share/cmake-2.6/Modules/FindPhysFS.cmake
-#usr/local/share/cmake-2.6/Modules/FindPike.cmake
-#usr/local/share/cmake-2.6/Modules/FindPkgConfig.cmake
-#usr/local/share/cmake-2.6/Modules/FindProducer.cmake
-#usr/local/share/cmake-2.6/Modules/FindPythonInterp.cmake
-#usr/local/share/cmake-2.6/Modules/FindPythonLibs.cmake
-#usr/local/share/cmake-2.6/Modules/FindQt.cmake
-#usr/local/share/cmake-2.6/Modules/FindQt3.cmake
-#usr/local/share/cmake-2.6/Modules/FindQt4.cmake
-#usr/local/share/cmake-2.6/Modules/FindQuickTime.cmake
-#usr/local/share/cmake-2.6/Modules/FindRTI.cmake
-#usr/local/share/cmake-2.6/Modules/FindRuby.cmake
-#usr/local/share/cmake-2.6/Modules/FindSDL.cmake
-#usr/local/share/cmake-2.6/Modules/FindSDL_image.cmake
-#usr/local/share/cmake-2.6/Modules/FindSDL_mixer.cmake
-#usr/local/share/cmake-2.6/Modules/FindSDL_net.cmake
-#usr/local/share/cmake-2.6/Modules/FindSDL_sound.cmake
-#usr/local/share/cmake-2.6/Modules/FindSDL_ttf.cmake
-#usr/local/share/cmake-2.6/Modules/FindSWIG.cmake
-#usr/local/share/cmake-2.6/Modules/FindSelfPackers.cmake
-#usr/local/share/cmake-2.6/Modules/FindSquish.cmake
-#usr/local/share/cmake-2.6/Modules/FindSubversion.cmake
-#usr/local/share/cmake-2.6/Modules/FindTCL.cmake
-#usr/local/share/cmake-2.6/Modules/FindTIFF.cmake
-#usr/local/share/cmake-2.6/Modules/FindTclStub.cmake
-#usr/local/share/cmake-2.6/Modules/FindTclsh.cmake
-#usr/local/share/cmake-2.6/Modules/FindThreads.cmake
-#usr/local/share/cmake-2.6/Modules/FindUnixCommands.cmake
-#usr/local/share/cmake-2.6/Modules/FindVTK.cmake
-#usr/local/share/cmake-2.6/Modules/FindWget.cmake
-#usr/local/share/cmake-2.6/Modules/FindWish.cmake
-#usr/local/share/cmake-2.6/Modules/FindX11.cmake
-#usr/local/share/cmake-2.6/Modules/FindXMLRPC.cmake
-#usr/local/share/cmake-2.6/Modules/FindZLIB.cmake
-#usr/local/share/cmake-2.6/Modules/Findosg.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgAnimation.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgDB.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgFX.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgGA.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgIntrospection.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgManipulator.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgParticle.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgProducer.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgShadow.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgSim.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgTerrain.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgText.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgUtil.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgViewer.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgVolume.cmake
-#usr/local/share/cmake-2.6/Modules/FindosgWidget.cmake
-#usr/local/share/cmake-2.6/Modules/Findosg_functions.cmake
-#usr/local/share/cmake-2.6/Modules/FindwxWidgets.cmake
-#usr/local/share/cmake-2.6/Modules/FindwxWindows.cmake
-#usr/local/share/cmake-2.6/Modules/FortranCInterface.cmake
-#usr/local/share/cmake-2.6/Modules/FortranCInterface.h.in
-#usr/local/share/cmake-2.6/Modules/GetPrerequisites.cmake
-#usr/local/share/cmake-2.6/Modules/ITKCompatibility.cmake
-#usr/local/share/cmake-2.6/Modules/InstallRequiredSystemLibraries.cmake
-#usr/local/share/cmake-2.6/Modules/KDE3Macros.cmake
-#usr/local/share/cmake-2.6/Modules/MacOSXBundleInfo.plist.in
-#usr/local/share/cmake-2.6/Modules/MacOSXFrameworkInfo.plist.in
-#usr/local/share/cmake-2.6/Modules/MacroAddFileDependencies.cmake
-#usr/local/share/cmake-2.6/Modules/NSIS.InstallOptions.ini.in
-#usr/local/share/cmake-2.6/Modules/NSIS.template.in
-#usr/local/share/cmake-2.6/Modules/Platform
-#usr/local/share/cmake-2.6/Modules/Platform/AIX-VisualAge-Fortran.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/AIX.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/BSDOS.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/BeOS.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/BlueGeneL.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/CYGWIN-g77.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/CYGWIN.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Catamount.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Darwin-icc.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Darwin-icpc.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Darwin-xlc.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Darwin.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/DragonFly.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/FreeBSD.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/GNU.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-ASM.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-C.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-CXX.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-Common.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Generic-SDCC-C.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Generic.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/HP-UX.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Haiku.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/IRIX.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/IRIX64.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-GNU-Fortran.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-Intel-C.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-Intel-CXX.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-Intel-Fortran.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-PGI-C.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-PGI-CXX.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-PGI-Fortran.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-SunPro-C.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-SunPro-CXX.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-SunPro-Fortran.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-VisualAge-C.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-VisualAge-Fortran.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-como.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-icpc.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux-ifort.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Linux.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/MP-RAS.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/NetBSD.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/OSF1.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/OpenBSD.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/QNX.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/RISCos.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/SCO_SV.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/SINIX.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/SunOS-SunPro-Fortran.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/SunOS.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Tru64.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/ULTRIX.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/UNIX_SV.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/UnixPaths.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/UnixWare.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Windows-bcc32.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Windows-cl.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Windows-cl.cmake.in
-#usr/local/share/cmake-2.6/Modules/Platform/Windows-df.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Windows-g++.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Windows-g77.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Windows-gcc.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Windows-icl.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Windows-ifort.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Windows-wcl386.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Windows.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/WindowsPaths.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/Xenix.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/cl.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/eCos.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/g77.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/gas.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/gcc.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/kFreeBSD.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/syllable.cmake
-#usr/local/share/cmake-2.6/Modules/Platform/xlf.cmake
-#usr/local/share/cmake-2.6/Modules/SquishTestScript.cmake
-#usr/local/share/cmake-2.6/Modules/SystemInformation.cmake
-#usr/local/share/cmake-2.6/Modules/SystemInformation.in
-#usr/local/share/cmake-2.6/Modules/TestBigEndian.cmake
-#usr/local/share/cmake-2.6/Modules/TestCXXAcceptsFlag.cmake
-#usr/local/share/cmake-2.6/Modules/TestEndianess.c.in
-#usr/local/share/cmake-2.6/Modules/TestForANSIForScope.cmake
-#usr/local/share/cmake-2.6/Modules/TestForANSIStreamHeaders.cmake
-#usr/local/share/cmake-2.6/Modules/TestForANSIStreamHeaders.cxx
-#usr/local/share/cmake-2.6/Modules/TestForAnsiForScope.cxx
-#usr/local/share/cmake-2.6/Modules/TestForSSTREAM.cmake
-#usr/local/share/cmake-2.6/Modules/TestForSSTREAM.cxx
-#usr/local/share/cmake-2.6/Modules/TestForSTDNamespace.cmake
-#usr/local/share/cmake-2.6/Modules/TestForSTDNamespace.cxx
-#usr/local/share/cmake-2.6/Modules/UseEcos.cmake
-#usr/local/share/cmake-2.6/Modules/UsePkgConfig.cmake
-#usr/local/share/cmake-2.6/Modules/UseQt4.cmake
-#usr/local/share/cmake-2.6/Modules/UseSWIG.cmake
-#usr/local/share/cmake-2.6/Modules/UseVTK40.cmake
-#usr/local/share/cmake-2.6/Modules/UseVTKBuildSettings40.cmake
-#usr/local/share/cmake-2.6/Modules/UseVTKConfig40.cmake
-#usr/local/share/cmake-2.6/Modules/Use_wxWindows.cmake
-#usr/local/share/cmake-2.6/Modules/UsewxWidgets.cmake
-#usr/local/share/cmake-2.6/Modules/VTKCompatibility.cmake
-#usr/local/share/cmake-2.6/Modules/ecos_clean.cmake
-#usr/local/share/cmake-2.6/Modules/kde3init_dummy.cpp.in
-#usr/local/share/cmake-2.6/Modules/kde3uic.cmake
-#usr/local/share/cmake-2.6/Modules/readme.txt
-#usr/local/share/cmake-2.6/Templates
-#usr/local/share/cmake-2.6/Templates/CMakeLists.txt
-#usr/local/share/cmake-2.6/Templates/CMakeVSMacros1.vsmacros
-#usr/local/share/cmake-2.6/Templates/CMakeVSMacros2.vsmacros
-#usr/local/share/cmake-2.6/Templates/CMakeVisualStudio6Configurations.cmake
-#usr/local/share/cmake-2.6/Templates/CPack.GenericDescription.txt
-#usr/local/share/cmake-2.6/Templates/CPack.GenericLicense.txt
-#usr/local/share/cmake-2.6/Templates/CPack.GenericWelcome.txt
-#usr/local/share/cmake-2.6/Templates/CPackConfig.cmake.in
-#usr/local/share/cmake-2.6/Templates/CTestScript.cmake.in
-#usr/local/share/cmake-2.6/Templates/DLLFooter.dsptemplate
-#usr/local/share/cmake-2.6/Templates/DLLHeader.dsptemplate
-#usr/local/share/cmake-2.6/Templates/EXEFooter.dsptemplate
-#usr/local/share/cmake-2.6/Templates/EXEHeader.dsptemplate
-#usr/local/share/cmake-2.6/Templates/EXEWinHeader.dsptemplate
-#usr/local/share/cmake-2.6/Templates/TestDriver.cxx.in
-#usr/local/share/cmake-2.6/Templates/UtilityFooter.dsptemplate
-#usr/local/share/cmake-2.6/Templates/UtilityHeader.dsptemplate
-#usr/local/share/cmake-2.6/Templates/cygwin-package.sh.in
-#usr/local/share/cmake-2.6/Templates/staticLibFooter.dsptemplate
-#usr/local/share/cmake-2.6/Templates/staticLibHeader.dsptemplate
-#usr/local/share/cmake-2.6/include
-#usr/local/share/cmake-2.6/include/cmCPluginAPI.h
+#usr/bin/ccmake
+#usr/bin/cmake
+#usr/bin/cpack
+#usr/bin/ctest
+#usr/doc/cmake-2.6
+#usr/doc/cmake-2.6/ccmake.docbook
+#usr/doc/cmake-2.6/ccmake.html
+#usr/doc/cmake-2.6/ccmake.txt
+#usr/doc/cmake-2.6/cmake-commands.html
+#usr/doc/cmake-2.6/cmake-commands.txt
+#usr/doc/cmake-2.6/cmake-compatcommands.html
+#usr/doc/cmake-2.6/cmake-compatcommands.txt
+#usr/doc/cmake-2.6/cmake-modules.html
+#usr/doc/cmake-2.6/cmake-modules.txt
+#usr/doc/cmake-2.6/cmake-policies.html
+#usr/doc/cmake-2.6/cmake-policies.txt
+#usr/doc/cmake-2.6/cmake-properties.html
+#usr/doc/cmake-2.6/cmake-properties.txt
+#usr/doc/cmake-2.6/cmake-variables.html
+#usr/doc/cmake-2.6/cmake-variables.txt
+#usr/doc/cmake-2.6/cmake.docbook
+#usr/doc/cmake-2.6/cmake.html
+#usr/doc/cmake-2.6/cmake.txt
+#usr/doc/cmake-2.6/cpack.docbook
+#usr/doc/cmake-2.6/cpack.html
+#usr/doc/cmake-2.6/cpack.txt
+#usr/doc/cmake-2.6/ctest.docbook
+#usr/doc/cmake-2.6/ctest.html
+#usr/doc/cmake-2.6/ctest.txt
+#usr/man/man1/ccmake.1
+#usr/man/man1/cmake.1
+#usr/man/man1/cmakecommands.1
+#usr/man/man1/cmakecompat.1
+#usr/man/man1/cmakemodules.1
+#usr/man/man1/cmakepolicies.1
+#usr/man/man1/cmakeprops.1
+#usr/man/man1/cmakevars.1
+#usr/man/man1/cpack.1
+#usr/man/man1/ctest.1
+#usr/share/cmake-2.6
+#usr/share/cmake-2.6/Modules
+#usr/share/cmake-2.6/Modules/AddFileDependencies.cmake
+#usr/share/cmake-2.6/Modules/BundleUtilities.cmake
+#usr/share/cmake-2.6/Modules/CMake.cmake
+#usr/share/cmake-2.6/Modules/CMakeASM-ATTInformation.cmake
+#usr/share/cmake-2.6/Modules/CMakeASMCompiler.cmake.in
+#usr/share/cmake-2.6/Modules/CMakeASMInformation.cmake
+#usr/share/cmake-2.6/Modules/CMakeASM_MASMInformation.cmake
+#usr/share/cmake-2.6/Modules/CMakeBackwardCompatibilityC.cmake
+#usr/share/cmake-2.6/Modules/CMakeBackwardCompatibilityCXX.cmake
+#usr/share/cmake-2.6/Modules/CMakeBorlandFindMake.cmake
+#usr/share/cmake-2.6/Modules/CMakeBuildSettings.cmake.in
+#usr/share/cmake-2.6/Modules/CMakeCCompiler.cmake.in
+#usr/share/cmake-2.6/Modules/CMakeCCompilerABI.c
+#usr/share/cmake-2.6/Modules/CMakeCCompilerId.c.in
+#usr/share/cmake-2.6/Modules/CMakeCInformation.cmake
+#usr/share/cmake-2.6/Modules/CMakeCXXCompiler.cmake.in
+#usr/share/cmake-2.6/Modules/CMakeCXXCompilerABI.cpp
+#usr/share/cmake-2.6/Modules/CMakeCXXCompilerId.cpp.in
+#usr/share/cmake-2.6/Modules/CMakeCXXInformation.cmake
+#usr/share/cmake-2.6/Modules/CMakeCommonLanguageInclude.cmake
+#usr/share/cmake-2.6/Modules/CMakeCompilerABI.h
+#usr/share/cmake-2.6/Modules/CMakeConfigurableFile.in
+#usr/share/cmake-2.6/Modules/CMakeDependentOption.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineASM-ATTCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineASMCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineASM_MASMCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineCCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineCXXCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineCompilerABI.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineCompilerId.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineFortranCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineJavaCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineRCCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeDetermineSystem.cmake
+#usr/share/cmake-2.6/Modules/CMakeExportBuildSettings.cmake
+#usr/share/cmake-2.6/Modules/CMakeFindBinUtils.cmake
+#usr/share/cmake-2.6/Modules/CMakeFindFrameworks.cmake
+#usr/share/cmake-2.6/Modules/CMakeFindWMake.cmake
+#usr/share/cmake-2.6/Modules/CMakeFindXCode.cmake
+#usr/share/cmake-2.6/Modules/CMakeForceCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeFortranCompiler.cmake.in
+#usr/share/cmake-2.6/Modules/CMakeFortranCompilerId.F90.in
+#usr/share/cmake-2.6/Modules/CMakeFortranInformation.cmake
+#usr/share/cmake-2.6/Modules/CMakeGenericSystem.cmake
+#usr/share/cmake-2.6/Modules/CMakeImportBuildSettings.cmake
+#usr/share/cmake-2.6/Modules/CMakeJavaCompiler.cmake.in
+#usr/share/cmake-2.6/Modules/CMakeJavaInformation.cmake
+#usr/share/cmake-2.6/Modules/CMakeMSYSFindMake.cmake
+#usr/share/cmake-2.6/Modules/CMakeMinGWFindMake.cmake
+#usr/share/cmake-2.6/Modules/CMakeNMakeFindMake.cmake
+#usr/share/cmake-2.6/Modules/CMakePlatformId.h.in
+#usr/share/cmake-2.6/Modules/CMakePrintSystemInformation.cmake
+#usr/share/cmake-2.6/Modules/CMakeRCCompiler.cmake.in
+#usr/share/cmake-2.6/Modules/CMakeRCInformation.cmake
+#usr/share/cmake-2.6/Modules/CMakeSystem.cmake.in
+#usr/share/cmake-2.6/Modules/CMakeSystemSpecificInformation.cmake
+#usr/share/cmake-2.6/Modules/CMakeTestASM-ATTCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeTestASMCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeTestASM_MASMCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeTestCCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeTestCXXCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeTestForFreeVC.cxx
+#usr/share/cmake-2.6/Modules/CMakeTestFortranCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeTestGNU.c
+#usr/share/cmake-2.6/Modules/CMakeTestJavaCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeTestNMakeCLVersion.c
+#usr/share/cmake-2.6/Modules/CMakeTestRCCompiler.cmake
+#usr/share/cmake-2.6/Modules/CMakeUnixFindMake.cmake
+#usr/share/cmake-2.6/Modules/CMakeVS6BackwardCompatibility.cmake
+#usr/share/cmake-2.6/Modules/CMakeVS6FindMake.cmake
+#usr/share/cmake-2.6/Modules/CMakeVS71FindMake.cmake
+#usr/share/cmake-2.6/Modules/CMakeVS7BackwardCompatibility.cmake
+#usr/share/cmake-2.6/Modules/CMakeVS7FindMake.cmake
+#usr/share/cmake-2.6/Modules/CMakeVS8FindMake.cmake
+#usr/share/cmake-2.6/Modules/CMakeVS9FindMake.cmake
+#usr/share/cmake-2.6/Modules/CPack.DS_Store.in
+#usr/share/cmake-2.6/Modules/CPack.Description.plist.in
+#usr/share/cmake-2.6/Modules/CPack.Info.plist.in
+#usr/share/cmake-2.6/Modules/CPack.OSXScriptLauncher.in
+#usr/share/cmake-2.6/Modules/CPack.OSXScriptLauncher.rsrc.in
+#usr/share/cmake-2.6/Modules/CPack.OSXX11.Info.plist.in
+#usr/share/cmake-2.6/Modules/CPack.OSXX11.main.scpt.in
+#usr/share/cmake-2.6/Modules/CPack.RuntimeScript.in
+#usr/share/cmake-2.6/Modules/CPack.STGZ_Header.sh.in
+#usr/share/cmake-2.6/Modules/CPack.VolumeIcon.icns.in
+#usr/share/cmake-2.6/Modules/CPack.background.png.in
+#usr/share/cmake-2.6/Modules/CPack.cmake
+#usr/share/cmake-2.6/Modules/CPack.distribution.dist.in
+#usr/share/cmake-2.6/Modules/CPackDeb.cmake
+#usr/share/cmake-2.6/Modules/CPackRPM.cmake
+#usr/share/cmake-2.6/Modules/CPackZIP.cmake
+#usr/share/cmake-2.6/Modules/CTest.cmake
+#usr/share/cmake-2.6/Modules/CTestTargets.cmake
+#usr/share/cmake-2.6/Modules/CheckCCompilerFlag.cmake
+#usr/share/cmake-2.6/Modules/CheckCSourceCompiles.cmake
+#usr/share/cmake-2.6/Modules/CheckCSourceRuns.cmake
+#usr/share/cmake-2.6/Modules/CheckCXXCompilerFlag.cmake
+#usr/share/cmake-2.6/Modules/CheckCXXSourceCompiles.cmake
+#usr/share/cmake-2.6/Modules/CheckCXXSourceRuns.cmake
+#usr/share/cmake-2.6/Modules/CheckForPthreads.c
+#usr/share/cmake-2.6/Modules/CheckFortranFunctionExists.cmake
+#usr/share/cmake-2.6/Modules/CheckFunctionExists.c
+#usr/share/cmake-2.6/Modules/CheckFunctionExists.cmake
+#usr/share/cmake-2.6/Modules/CheckIncludeFile.c.in
+#usr/share/cmake-2.6/Modules/CheckIncludeFile.cmake
+#usr/share/cmake-2.6/Modules/CheckIncludeFile.cxx.in
+#usr/share/cmake-2.6/Modules/CheckIncludeFileCXX.cmake
+#usr/share/cmake-2.6/Modules/CheckIncludeFiles.cmake
+#usr/share/cmake-2.6/Modules/CheckLibraryExists.cmake
+#usr/share/cmake-2.6/Modules/CheckLibraryExists.lists.in
+#usr/share/cmake-2.6/Modules/CheckSizeOf.cmake
+#usr/share/cmake-2.6/Modules/CheckStructHasMember.cmake
+#usr/share/cmake-2.6/Modules/CheckSymbolExists.cmake
+#usr/share/cmake-2.6/Modules/CheckTypeSize.cmake
+#usr/share/cmake-2.6/Modules/CheckTypeSizeC.c.in
+#usr/share/cmake-2.6/Modules/CheckVariableExists.c
+#usr/share/cmake-2.6/Modules/CheckVariableExists.cmake
+#usr/share/cmake-2.6/Modules/Dart.cmake
+#usr/share/cmake-2.6/Modules/DartConfiguration.tcl.in
+#usr/share/cmake-2.6/Modules/Documentation.cmake
+#usr/share/cmake-2.6/Modules/DummyCXXFile.cxx
+#usr/share/cmake-2.6/Modules/FLTKCompatibility.cmake
+#usr/share/cmake-2.6/Modules/FeatureSummary.cmake
+#usr/share/cmake-2.6/Modules/FindASPELL.cmake
+#usr/share/cmake-2.6/Modules/FindAVIFile.cmake
+#usr/share/cmake-2.6/Modules/FindBLAS.cmake
+#usr/share/cmake-2.6/Modules/FindBZip2.cmake
+#usr/share/cmake-2.6/Modules/FindBoost.cmake
+#usr/share/cmake-2.6/Modules/FindCABLE.cmake
+#usr/share/cmake-2.6/Modules/FindCURL.cmake
+#usr/share/cmake-2.6/Modules/FindCVS.cmake
+#usr/share/cmake-2.6/Modules/FindCoin3D.cmake
+#usr/share/cmake-2.6/Modules/FindCups.cmake
+#usr/share/cmake-2.6/Modules/FindCurses.cmake
+#usr/share/cmake-2.6/Modules/FindCxxTest.cmake
+#usr/share/cmake-2.6/Modules/FindCygwin.cmake
+#usr/share/cmake-2.6/Modules/FindDCMTK.cmake
+#usr/share/cmake-2.6/Modules/FindDart.cmake
+#usr/share/cmake-2.6/Modules/FindDevIL.cmake
+#usr/share/cmake-2.6/Modules/FindDoxygen.cmake
+#usr/share/cmake-2.6/Modules/FindEXPAT.cmake
+#usr/share/cmake-2.6/Modules/FindFLTK.cmake
+#usr/share/cmake-2.6/Modules/FindFLTK2.cmake
+#usr/share/cmake-2.6/Modules/FindFreetype.cmake
+#usr/share/cmake-2.6/Modules/FindGCCXML.cmake
+#usr/share/cmake-2.6/Modules/FindGDAL.cmake
+#usr/share/cmake-2.6/Modules/FindGIF.cmake
+#usr/share/cmake-2.6/Modules/FindGLU.cmake
+#usr/share/cmake-2.6/Modules/FindGLUT.cmake
+#usr/share/cmake-2.6/Modules/FindGTK.cmake
+#usr/share/cmake-2.6/Modules/FindGettext.cmake
+#usr/share/cmake-2.6/Modules/FindGnuplot.cmake
+#usr/share/cmake-2.6/Modules/FindHSPELL.cmake
+#usr/share/cmake-2.6/Modules/FindHTMLHelp.cmake
+#usr/share/cmake-2.6/Modules/FindITK.cmake
+#usr/share/cmake-2.6/Modules/FindImageMagick.cmake
+#usr/share/cmake-2.6/Modules/FindJNI.cmake
+#usr/share/cmake-2.6/Modules/FindJPEG.cmake
+#usr/share/cmake-2.6/Modules/FindJasper.cmake
+#usr/share/cmake-2.6/Modules/FindJava.cmake
+#usr/share/cmake-2.6/Modules/FindKDE3.cmake
+#usr/share/cmake-2.6/Modules/FindKDE4.cmake
+#usr/share/cmake-2.6/Modules/FindLAPACK.cmake
+#usr/share/cmake-2.6/Modules/FindLATEX.cmake
+#usr/share/cmake-2.6/Modules/FindLibXml2.cmake
+#usr/share/cmake-2.6/Modules/FindLibXslt.cmake
+#usr/share/cmake-2.6/Modules/FindLua50.cmake
+#usr/share/cmake-2.6/Modules/FindLua51.cmake
+#usr/share/cmake-2.6/Modules/FindMFC.cmake
+#usr/share/cmake-2.6/Modules/FindMPEG.cmake
+#usr/share/cmake-2.6/Modules/FindMPEG2.cmake
+#usr/share/cmake-2.6/Modules/FindMPI.cmake
+#usr/share/cmake-2.6/Modules/FindMatlab.cmake
+#usr/share/cmake-2.6/Modules/FindMotif.cmake
+#usr/share/cmake-2.6/Modules/FindOpenAL.cmake
+#usr/share/cmake-2.6/Modules/FindOpenGL.cmake
+#usr/share/cmake-2.6/Modules/FindOpenMP.cmake
+#usr/share/cmake-2.6/Modules/FindOpenSSL.cmake
+#usr/share/cmake-2.6/Modules/FindOpenSceneGraph.cmake
+#usr/share/cmake-2.6/Modules/FindOpenThreads.cmake
+#usr/share/cmake-2.6/Modules/FindPHP4.cmake
+#usr/share/cmake-2.6/Modules/FindPNG.cmake
+#usr/share/cmake-2.6/Modules/FindPackageHandleStandardArgs.cmake
+#usr/share/cmake-2.6/Modules/FindPackageMessage.cmake
+#usr/share/cmake-2.6/Modules/FindPerl.cmake
+#usr/share/cmake-2.6/Modules/FindPerlLibs.cmake
+#usr/share/cmake-2.6/Modules/FindPhysFS.cmake
+#usr/share/cmake-2.6/Modules/FindPike.cmake
+#usr/share/cmake-2.6/Modules/FindPkgConfig.cmake
+#usr/share/cmake-2.6/Modules/FindProducer.cmake
+#usr/share/cmake-2.6/Modules/FindPythonInterp.cmake
+#usr/share/cmake-2.6/Modules/FindPythonLibs.cmake
+#usr/share/cmake-2.6/Modules/FindQt.cmake
+#usr/share/cmake-2.6/Modules/FindQt3.cmake
+#usr/share/cmake-2.6/Modules/FindQt4.cmake
+#usr/share/cmake-2.6/Modules/FindQuickTime.cmake
+#usr/share/cmake-2.6/Modules/FindRTI.cmake
+#usr/share/cmake-2.6/Modules/FindRuby.cmake
+#usr/share/cmake-2.6/Modules/FindSDL.cmake
+#usr/share/cmake-2.6/Modules/FindSDL_image.cmake
+#usr/share/cmake-2.6/Modules/FindSDL_mixer.cmake
+#usr/share/cmake-2.6/Modules/FindSDL_net.cmake
+#usr/share/cmake-2.6/Modules/FindSDL_sound.cmake
+#usr/share/cmake-2.6/Modules/FindSDL_ttf.cmake
+#usr/share/cmake-2.6/Modules/FindSWIG.cmake
+#usr/share/cmake-2.6/Modules/FindSelfPackers.cmake
+#usr/share/cmake-2.6/Modules/FindSquish.cmake
+#usr/share/cmake-2.6/Modules/FindSubversion.cmake
+#usr/share/cmake-2.6/Modules/FindTCL.cmake
+#usr/share/cmake-2.6/Modules/FindTIFF.cmake
+#usr/share/cmake-2.6/Modules/FindTclStub.cmake
+#usr/share/cmake-2.6/Modules/FindTclsh.cmake
+#usr/share/cmake-2.6/Modules/FindThreads.cmake
+#usr/share/cmake-2.6/Modules/FindUnixCommands.cmake
+#usr/share/cmake-2.6/Modules/FindVTK.cmake
+#usr/share/cmake-2.6/Modules/FindWget.cmake
+#usr/share/cmake-2.6/Modules/FindWish.cmake
+#usr/share/cmake-2.6/Modules/FindX11.cmake
+#usr/share/cmake-2.6/Modules/FindXMLRPC.cmake
+#usr/share/cmake-2.6/Modules/FindZLIB.cmake
+#usr/share/cmake-2.6/Modules/Findosg.cmake
+#usr/share/cmake-2.6/Modules/FindosgAnimation.cmake
+#usr/share/cmake-2.6/Modules/FindosgDB.cmake
+#usr/share/cmake-2.6/Modules/FindosgFX.cmake
+#usr/share/cmake-2.6/Modules/FindosgGA.cmake
+#usr/share/cmake-2.6/Modules/FindosgIntrospection.cmake
+#usr/share/cmake-2.6/Modules/FindosgManipulator.cmake
+#usr/share/cmake-2.6/Modules/FindosgParticle.cmake
+#usr/share/cmake-2.6/Modules/FindosgProducer.cmake
+#usr/share/cmake-2.6/Modules/FindosgShadow.cmake
+#usr/share/cmake-2.6/Modules/FindosgSim.cmake
+#usr/share/cmake-2.6/Modules/FindosgTerrain.cmake
+#usr/share/cmake-2.6/Modules/FindosgText.cmake
+#usr/share/cmake-2.6/Modules/FindosgUtil.cmake
+#usr/share/cmake-2.6/Modules/FindosgViewer.cmake
+#usr/share/cmake-2.6/Modules/FindosgVolume.cmake
+#usr/share/cmake-2.6/Modules/FindosgWidget.cmake
+#usr/share/cmake-2.6/Modules/Findosg_functions.cmake
+#usr/share/cmake-2.6/Modules/FindwxWidgets.cmake
+#usr/share/cmake-2.6/Modules/FindwxWindows.cmake
+#usr/share/cmake-2.6/Modules/FortranCInterface.cmake
+#usr/share/cmake-2.6/Modules/FortranCInterface.h.in
+#usr/share/cmake-2.6/Modules/GetPrerequisites.cmake
+#usr/share/cmake-2.6/Modules/ITKCompatibility.cmake
+#usr/share/cmake-2.6/Modules/InstallRequiredSystemLibraries.cmake
+#usr/share/cmake-2.6/Modules/KDE3Macros.cmake
+#usr/share/cmake-2.6/Modules/MacOSXBundleInfo.plist.in
+#usr/share/cmake-2.6/Modules/MacOSXFrameworkInfo.plist.in
+#usr/share/cmake-2.6/Modules/MacroAddFileDependencies.cmake
+#usr/share/cmake-2.6/Modules/NSIS.InstallOptions.ini.in
+#usr/share/cmake-2.6/Modules/NSIS.template.in
+#usr/share/cmake-2.6/Modules/Platform
+#usr/share/cmake-2.6/Modules/Platform/AIX-VisualAge-Fortran.cmake
+#usr/share/cmake-2.6/Modules/Platform/AIX.cmake
+#usr/share/cmake-2.6/Modules/Platform/BSDOS.cmake
+#usr/share/cmake-2.6/Modules/Platform/BeOS.cmake
+#usr/share/cmake-2.6/Modules/Platform/BlueGeneL.cmake
+#usr/share/cmake-2.6/Modules/Platform/CYGWIN-g77.cmake
+#usr/share/cmake-2.6/Modules/Platform/CYGWIN.cmake
+#usr/share/cmake-2.6/Modules/Platform/Catamount.cmake
+#usr/share/cmake-2.6/Modules/Platform/Darwin-icc.cmake
+#usr/share/cmake-2.6/Modules/Platform/Darwin-icpc.cmake
+#usr/share/cmake-2.6/Modules/Platform/Darwin-xlc.cmake
+#usr/share/cmake-2.6/Modules/Platform/Darwin.cmake
+#usr/share/cmake-2.6/Modules/Platform/DragonFly.cmake
+#usr/share/cmake-2.6/Modules/Platform/FreeBSD.cmake
+#usr/share/cmake-2.6/Modules/Platform/GNU.cmake
+#usr/share/cmake-2.6/Modules/Platform/Generic-ADSP-ASM.cmake
+#usr/share/cmake-2.6/Modules/Platform/Generic-ADSP-C.cmake
+#usr/share/cmake-2.6/Modules/Platform/Generic-ADSP-CXX.cmake
+#usr/share/cmake-2.6/Modules/Platform/Generic-ADSP-Common.cmake
+#usr/share/cmake-2.6/Modules/Platform/Generic-SDCC-C.cmake
+#usr/share/cmake-2.6/Modules/Platform/Generic.cmake
+#usr/share/cmake-2.6/Modules/Platform/HP-UX.cmake
+#usr/share/cmake-2.6/Modules/Platform/Haiku.cmake
+#usr/share/cmake-2.6/Modules/Platform/IRIX.cmake
+#usr/share/cmake-2.6/Modules/Platform/IRIX64.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-GNU-Fortran.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-Intel-C.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-Intel-CXX.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-Intel-Fortran.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-PGI-C.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-PGI-CXX.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-PGI-Fortran.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-SunPro-C.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-SunPro-CXX.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-SunPro-Fortran.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-VisualAge-C.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-VisualAge-Fortran.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-como.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-icpc.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux-ifort.cmake
+#usr/share/cmake-2.6/Modules/Platform/Linux.cmake
+#usr/share/cmake-2.6/Modules/Platform/MP-RAS.cmake
+#usr/share/cmake-2.6/Modules/Platform/NetBSD.cmake
+#usr/share/cmake-2.6/Modules/Platform/OSF1.cmake
+#usr/share/cmake-2.6/Modules/Platform/OpenBSD.cmake
+#usr/share/cmake-2.6/Modules/Platform/QNX.cmake
+#usr/share/cmake-2.6/Modules/Platform/RISCos.cmake
+#usr/share/cmake-2.6/Modules/Platform/SCO_SV.cmake
+#usr/share/cmake-2.6/Modules/Platform/SINIX.cmake
+#usr/share/cmake-2.6/Modules/Platform/SunOS-SunPro-Fortran.cmake
+#usr/share/cmake-2.6/Modules/Platform/SunOS.cmake
+#usr/share/cmake-2.6/Modules/Platform/Tru64.cmake
+#usr/share/cmake-2.6/Modules/Platform/ULTRIX.cmake
+#usr/share/cmake-2.6/Modules/Platform/UNIX_SV.cmake
+#usr/share/cmake-2.6/Modules/Platform/UnixPaths.cmake
+#usr/share/cmake-2.6/Modules/Platform/UnixWare.cmake
+#usr/share/cmake-2.6/Modules/Platform/Windows-bcc32.cmake
+#usr/share/cmake-2.6/Modules/Platform/Windows-cl.cmake
+#usr/share/cmake-2.6/Modules/Platform/Windows-cl.cmake.in
+#usr/share/cmake-2.6/Modules/Platform/Windows-df.cmake
+#usr/share/cmake-2.6/Modules/Platform/Windows-g++.cmake
+#usr/share/cmake-2.6/Modules/Platform/Windows-g77.cmake
+#usr/share/cmake-2.6/Modules/Platform/Windows-gcc.cmake
+#usr/share/cmake-2.6/Modules/Platform/Windows-icl.cmake
+#usr/share/cmake-2.6/Modules/Platform/Windows-ifort.cmake
+#usr/share/cmake-2.6/Modules/Platform/Windows-wcl386.cmake
+#usr/share/cmake-2.6/Modules/Platform/Windows.cmake
+#usr/share/cmake-2.6/Modules/Platform/WindowsPaths.cmake
+#usr/share/cmake-2.6/Modules/Platform/Xenix.cmake
+#usr/share/cmake-2.6/Modules/Platform/cl.cmake
+#usr/share/cmake-2.6/Modules/Platform/eCos.cmake
+#usr/share/cmake-2.6/Modules/Platform/g77.cmake
+#usr/share/cmake-2.6/Modules/Platform/gas.cmake
+#usr/share/cmake-2.6/Modules/Platform/gcc.cmake
+#usr/share/cmake-2.6/Modules/Platform/kFreeBSD.cmake
+#usr/share/cmake-2.6/Modules/Platform/syllable.cmake
+#usr/share/cmake-2.6/Modules/Platform/xlf.cmake
+#usr/share/cmake-2.6/Modules/SquishTestScript.cmake
+#usr/share/cmake-2.6/Modules/SystemInformation.cmake
+#usr/share/cmake-2.6/Modules/SystemInformation.in
+#usr/share/cmake-2.6/Modules/TestBigEndian.cmake
+#usr/share/cmake-2.6/Modules/TestCXXAcceptsFlag.cmake
+#usr/share/cmake-2.6/Modules/TestEndianess.c.in
+#usr/share/cmake-2.6/Modules/TestForANSIForScope.cmake
+#usr/share/cmake-2.6/Modules/TestForANSIStreamHeaders.cmake
+#usr/share/cmake-2.6/Modules/TestForANSIStreamHeaders.cxx
+#usr/share/cmake-2.6/Modules/TestForAnsiForScope.cxx
+#usr/share/cmake-2.6/Modules/TestForSSTREAM.cmake
+#usr/share/cmake-2.6/Modules/TestForSSTREAM.cxx
+#usr/share/cmake-2.6/Modules/TestForSTDNamespace.cmake
+#usr/share/cmake-2.6/Modules/TestForSTDNamespace.cxx
+#usr/share/cmake-2.6/Modules/UseEcos.cmake
+#usr/share/cmake-2.6/Modules/UsePkgConfig.cmake
+#usr/share/cmake-2.6/Modules/UseQt4.cmake
+#usr/share/cmake-2.6/Modules/UseSWIG.cmake
+#usr/share/cmake-2.6/Modules/UseVTK40.cmake
+#usr/share/cmake-2.6/Modules/UseVTKBuildSettings40.cmake
+#usr/share/cmake-2.6/Modules/UseVTKConfig40.cmake
+#usr/share/cmake-2.6/Modules/Use_wxWindows.cmake
+#usr/share/cmake-2.6/Modules/UsewxWidgets.cmake
+#usr/share/cmake-2.6/Modules/VTKCompatibility.cmake
+#usr/share/cmake-2.6/Modules/ecos_clean.cmake
+#usr/share/cmake-2.6/Modules/kde3init_dummy.cpp.in
+#usr/share/cmake-2.6/Modules/kde3uic.cmake
+#usr/share/cmake-2.6/Modules/readme.txt
+#usr/share/cmake-2.6/Templates
+#usr/share/cmake-2.6/Templates/CMakeLists.txt
+#usr/share/cmake-2.6/Templates/CMakeVSMacros1.vsmacros
+#usr/share/cmake-2.6/Templates/CMakeVSMacros2.vsmacros
+#usr/share/cmake-2.6/Templates/CMakeVisualStudio6Configurations.cmake
+#usr/share/cmake-2.6/Templates/CPack.GenericDescription.txt
+#usr/share/cmake-2.6/Templates/CPack.GenericLicense.txt
+#usr/share/cmake-2.6/Templates/CPack.GenericWelcome.txt
+#usr/share/cmake-2.6/Templates/CPackConfig.cmake.in
+#usr/share/cmake-2.6/Templates/CTestScript.cmake.in
+#usr/share/cmake-2.6/Templates/DLLFooter.dsptemplate
+#usr/share/cmake-2.6/Templates/DLLHeader.dsptemplate
+#usr/share/cmake-2.6/Templates/EXEFooter.dsptemplate
+#usr/share/cmake-2.6/Templates/EXEHeader.dsptemplate
+#usr/share/cmake-2.6/Templates/EXEWinHeader.dsptemplate
+#usr/share/cmake-2.6/Templates/TestDriver.cxx.in
+#usr/share/cmake-2.6/Templates/UtilityFooter.dsptemplate
+#usr/share/cmake-2.6/Templates/UtilityHeader.dsptemplate
+#usr/share/cmake-2.6/Templates/cygwin-package.sh.in
+#usr/share/cmake-2.6/Templates/staticLibFooter.dsptemplate
+#usr/share/cmake-2.6/Templates/staticLibHeader.dsptemplate
+#usr/share/cmake-2.6/include
+#usr/share/cmake-2.6/include/cmCPluginAPI.h
--- /dev/null
+usr/lib/ipsec/plugins/libstrongswan-padlock.so
#etc/iproute2
etc/iproute2/ematch_map
+etc/iproute2/group
etc/iproute2/rt_dsfield
etc/iproute2/rt_protos
etc/iproute2/rt_realms
etc/iproute2/rt_scopes
etc/iproute2/rt_tables
sbin/ctstat
+sbin/genl
sbin/ifcfg
sbin/ifstat
sbin/ip
#usr/lib/tc/normal.dist
#usr/lib/tc/pareto.dist
#usr/lib/tc/paretonormal.dist
-#usr/lib/tc/q_netem.so
usr/sbin/arpd
#usr/share/doc/iproute2
#usr/share/doc/iproute2/SNAPSHOT.tex
#usr/share/doc/iproute2/examples/diffserv/ef-prio
#usr/share/doc/iproute2/examples/diffserv/efcbq
#usr/share/doc/iproute2/examples/diffserv/regression-testing
+#usr/share/doc/iproute2/examples/gaiconf
#usr/share/doc/iproute2/ip-cref.tex
#usr/share/doc/iproute2/ip-tunnels.tex
#usr/share/doc/iproute2/nstat.sgml
#usr/share/doc/iproute2/rtstat.sgml
#usr/share/doc/iproute2/ss.sgml
#usr/share/man/man3/libnetlink.3
+#usr/share/man/man8/arpd.8
+#usr/share/man/man8/ctstat.8
+#usr/share/man/man8/ip-address.8
+#usr/share/man/man8/ip-addrlabel.8
+#usr/share/man/man8/ip-link.8
+#usr/share/man/man8/ip-maddress.8
+#usr/share/man/man8/ip-monitor.8
+#usr/share/man/man8/ip-mroute.8
+#usr/share/man/man8/ip-neighbour.8
+#usr/share/man/man8/ip-netns.8
+#usr/share/man/man8/ip-ntable.8
+#usr/share/man/man8/ip-route.8
+#usr/share/man/man8/ip-rule.8
+#usr/share/man/man8/ip-tunnel.8
+#usr/share/man/man8/ip-xfrm.8
#usr/share/man/man8/ip.8
+#usr/share/man/man8/lnstat.8
+#usr/share/man/man8/nstat.8
+#usr/share/man/man8/routef.8
+#usr/share/man/man8/routel.8
+#usr/share/man/man8/rtacct.8
+#usr/share/man/man8/rtmon.8
+#usr/share/man/man8/rtstat.8
+#usr/share/man/man8/ss.8
#usr/share/man/man8/tc-bfifo.8
#usr/share/man/man8/tc-cbq-details.8
#usr/share/man/man8/tc-cbq.8
+#usr/share/man/man8/tc-choke.8
+#usr/share/man/man8/tc-drr.8
+#usr/share/man/man8/tc-hfsc.8
#usr/share/man/man8/tc-htb.8
-#usr/share/man/man8/tc-pbfifo.8
+#usr/share/man/man8/tc-netem.8
#usr/share/man/man8/tc-pfifo.8
#usr/share/man/man8/tc-pfifo_fast.8
#usr/share/man/man8/tc-prio.8
#usr/share/man/man8/tc-red.8
+#usr/share/man/man8/tc-sfb.8
#usr/share/man/man8/tc-sfq.8
+#usr/share/man/man8/tc-stab.8
#usr/share/man/man8/tc-tbf.8
#usr/share/man/man8/tc.8
+var/lib/arpd
-lib/libpcre.so.0
-lib/libpcre.so.0.0.1
#usr/bin/pcre-config
#usr/bin/pcregrep
#usr/bin/pcretest
#usr/include/pcrecpp.h
#usr/include/pcrecpparg.h
#usr/include/pcreposix.h
-#usr/lib/libpcre.a
#usr/lib/libpcre.la
usr/lib/libpcre.so
-#usr/lib/libpcrecpp.a
+usr/lib/libpcre.so.1
+usr/lib/libpcre.so.1.0.1
#usr/lib/libpcrecpp.la
usr/lib/libpcrecpp.so
usr/lib/libpcrecpp.so.0
usr/lib/libpcrecpp.so.0.0.0
-#usr/lib/libpcreposix.a
#usr/lib/libpcreposix.la
usr/lib/libpcreposix.so
usr/lib/libpcreposix.so.0
-usr/lib/libpcreposix.so.0.0.0
+usr/lib/libpcreposix.so.0.0.1
#usr/lib/pkgconfig/libpcre.pc
-#usr/man/man1/pcregrep.1
-#usr/man/man1/pcretest.1
-#usr/man/man3/pcre.3
-#usr/man/man3/pcre_compile.3
-#usr/man/man3/pcre_compile2.3
-#usr/man/man3/pcre_config.3
-#usr/man/man3/pcre_copy_named_substring.3
-#usr/man/man3/pcre_copy_substring.3
-#usr/man/man3/pcre_dfa_exec.3
-#usr/man/man3/pcre_exec.3
-#usr/man/man3/pcre_free_substring.3
-#usr/man/man3/pcre_free_substring_list.3
-#usr/man/man3/pcre_fullinfo.3
-#usr/man/man3/pcre_get_named_substring.3
-#usr/man/man3/pcre_get_stringnumber.3
-#usr/man/man3/pcre_get_stringtable_entries.3
-#usr/man/man3/pcre_get_substring.3
-#usr/man/man3/pcre_get_substring_list.3
-#usr/man/man3/pcre_info.3
-#usr/man/man3/pcre_maketables.3
-#usr/man/man3/pcre_refcount.3
-#usr/man/man3/pcre_study.3
-#usr/man/man3/pcre_version.3
-#usr/man/man3/pcreapi.3
-#usr/man/man3/pcrebuild.3
-#usr/man/man3/pcrecallout.3
-#usr/man/man3/pcrecompat.3
-#usr/man/man3/pcrecpp.3
-#usr/man/man3/pcrematching.3
-#usr/man/man3/pcrepartial.3
-#usr/man/man3/pcrepattern.3
-#usr/man/man3/pcreperform.3
-#usr/man/man3/pcreposix.3
-#usr/man/man3/pcreprecompile.3
-#usr/man/man3/pcresample.3
-#usr/man/man3/pcrestack.3
#usr/lib/pkgconfig/libpcrecpp.pc
+#usr/lib/pkgconfig/libpcreposix.pc
#usr/share/doc/pcre
#usr/share/doc/pcre/AUTHORS
#usr/share/doc/pcre/COPYING
#usr/share/doc/pcre/html/index.html
#usr/share/doc/pcre/html/pcre-config.html
#usr/share/doc/pcre/html/pcre.html
+#usr/share/doc/pcre/html/pcre16.html
+#usr/share/doc/pcre/html/pcre_assign_jit_stack.html
#usr/share/doc/pcre/html/pcre_compile.html
#usr/share/doc/pcre/html/pcre_compile2.html
#usr/share/doc/pcre/html/pcre_config.html
#usr/share/doc/pcre/html/pcre_copy_substring.html
#usr/share/doc/pcre/html/pcre_dfa_exec.html
#usr/share/doc/pcre/html/pcre_exec.html
+#usr/share/doc/pcre/html/pcre_free_study.html
#usr/share/doc/pcre/html/pcre_free_substring.html
#usr/share/doc/pcre/html/pcre_free_substring_list.html
#usr/share/doc/pcre/html/pcre_fullinfo.html
#usr/share/doc/pcre/html/pcre_get_stringtable_entries.html
#usr/share/doc/pcre/html/pcre_get_substring.html
#usr/share/doc/pcre/html/pcre_get_substring_list.html
-#usr/share/doc/pcre/html/pcre_info.html
+#usr/share/doc/pcre/html/pcre_jit_stack_alloc.html
+#usr/share/doc/pcre/html/pcre_jit_stack_free.html
#usr/share/doc/pcre/html/pcre_maketables.html
+#usr/share/doc/pcre/html/pcre_pattern_to_host_byte_order.html
#usr/share/doc/pcre/html/pcre_refcount.html
#usr/share/doc/pcre/html/pcre_study.html
+#usr/share/doc/pcre/html/pcre_utf16_to_host_byte_order.html
#usr/share/doc/pcre/html/pcre_version.html
#usr/share/doc/pcre/html/pcreapi.html
#usr/share/doc/pcre/html/pcrebuild.html
#usr/share/doc/pcre/html/pcrecallout.html
#usr/share/doc/pcre/html/pcrecompat.html
#usr/share/doc/pcre/html/pcrecpp.html
+#usr/share/doc/pcre/html/pcredemo.html
#usr/share/doc/pcre/html/pcregrep.html
+#usr/share/doc/pcre/html/pcrejit.html
+#usr/share/doc/pcre/html/pcrelimits.html
#usr/share/doc/pcre/html/pcrematching.html
#usr/share/doc/pcre/html/pcrepartial.html
#usr/share/doc/pcre/html/pcrepattern.html
#usr/share/doc/pcre/html/pcrestack.html
#usr/share/doc/pcre/html/pcresyntax.html
#usr/share/doc/pcre/html/pcretest.html
+#usr/share/doc/pcre/html/pcreunicode.html
#usr/share/doc/pcre/pcre-config.txt
#usr/share/doc/pcre/pcre.txt
#usr/share/doc/pcre/pcregrep.txt
#usr/share/man/man1/pcregrep.1
#usr/share/man/man1/pcretest.1
#usr/share/man/man3/pcre.3
+#usr/share/man/man3/pcre16.3
+#usr/share/man/man3/pcre16_assign_jit_stack.3
+#usr/share/man/man3/pcre16_compile.3
+#usr/share/man/man3/pcre16_compile2.3
+#usr/share/man/man3/pcre16_config.3
+#usr/share/man/man3/pcre16_copy_named_substring.3
+#usr/share/man/man3/pcre16_copy_substring.3
+#usr/share/man/man3/pcre16_dfa_exec.3
+#usr/share/man/man3/pcre16_exec.3
+#usr/share/man/man3/pcre16_free_study.3
+#usr/share/man/man3/pcre16_free_substring.3
+#usr/share/man/man3/pcre16_free_substring_list.3
+#usr/share/man/man3/pcre16_fullinfo.3
+#usr/share/man/man3/pcre16_get_named_substring.3
+#usr/share/man/man3/pcre16_get_stringnumber.3
+#usr/share/man/man3/pcre16_get_stringtable_entries.3
+#usr/share/man/man3/pcre16_get_substring.3
+#usr/share/man/man3/pcre16_get_substring_list.3
+#usr/share/man/man3/pcre16_jit_stack_alloc.3
+#usr/share/man/man3/pcre16_jit_stack_free.3
+#usr/share/man/man3/pcre16_maketables.3
+#usr/share/man/man3/pcre16_pattern_to_host_byte_order.3
+#usr/share/man/man3/pcre16_refcount.3
+#usr/share/man/man3/pcre16_study.3
+#usr/share/man/man3/pcre16_utf16_to_host_byte_order.3
+#usr/share/man/man3/pcre16_version.3
+#usr/share/man/man3/pcre_assign_jit_stack.3
#usr/share/man/man3/pcre_compile.3
#usr/share/man/man3/pcre_compile2.3
#usr/share/man/man3/pcre_config.3
#usr/share/man/man3/pcre_copy_substring.3
#usr/share/man/man3/pcre_dfa_exec.3
#usr/share/man/man3/pcre_exec.3
+#usr/share/man/man3/pcre_free_study.3
#usr/share/man/man3/pcre_free_substring.3
#usr/share/man/man3/pcre_free_substring_list.3
#usr/share/man/man3/pcre_fullinfo.3
#usr/share/man/man3/pcre_get_stringtable_entries.3
#usr/share/man/man3/pcre_get_substring.3
#usr/share/man/man3/pcre_get_substring_list.3
-#usr/share/man/man3/pcre_info.3
+#usr/share/man/man3/pcre_jit_stack_alloc.3
+#usr/share/man/man3/pcre_jit_stack_free.3
#usr/share/man/man3/pcre_maketables.3
+#usr/share/man/man3/pcre_pattern_to_host_byte_order.3
#usr/share/man/man3/pcre_refcount.3
#usr/share/man/man3/pcre_study.3
+#usr/share/man/man3/pcre_utf16_to_host_byte_order.3
#usr/share/man/man3/pcre_version.3
#usr/share/man/man3/pcreapi.3
#usr/share/man/man3/pcrebuild.3
#usr/share/man/man3/pcrecallout.3
#usr/share/man/man3/pcrecompat.3
#usr/share/man/man3/pcrecpp.3
+#usr/share/man/man3/pcrejit.3
+#usr/share/man/man3/pcrelimits.3
#usr/share/man/man3/pcrematching.3
#usr/share/man/man3/pcrepartial.3
#usr/share/man/man3/pcrepattern.3
#usr/share/man/man3/pcresample.3
#usr/share/man/man3/pcrestack.3
#usr/share/man/man3/pcresyntax.3
+#usr/share/man/man3/pcreunicode.3
--- /dev/null
+lib/libpcre.so.0
+lib/libpcre.so.0.0.1
usr/lib/ipsec/plugins/libstrongswan-md5.so
usr/lib/ipsec/plugins/libstrongswan-nonce.so
usr/lib/ipsec/plugins/libstrongswan-openssl.so
-usr/lib/ipsec/plugins/libstrongswan-padlock.so
+#usr/lib/ipsec/plugins/libstrongswan-padlock.so
usr/lib/ipsec/plugins/libstrongswan-pem.so
usr/lib/ipsec/plugins/libstrongswan-pgp.so
usr/lib/ipsec/plugins/libstrongswan-pkcs1.so
VERSUFIX=ipfire$(KCFG)
-VER = 3.5-3-snpc
+VER = 3.5.1-1-snpc
ifeq "$(KCFG)" "-xen"
KVER = 2.6.32.59
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz
-$(DL_FILE)_MD5 = 66f27eed39aacd567f67025305273cd7
+$(DL_FILE)_MD5 = eea8d1c430ad38b713457438e04f47f5
asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde
install : $(TARGET)
# kfifo has no license info and taints kernel
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
+ # Codel patches
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_codel-avoid-a-nul-rec_inv_sqrt.patch
+
# Build ath5k only if target has pci
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libmad-0.15.1b-cflags.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libmad-0.15.1b-cflags-O2.patch
- cd $(DIR_APP) && autoreconf -vfi
+ cd $(DIR_APP) && autoconf
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
include Config
-VER = 2.0.17
+VER = 2.0.18
THISAPP = libsigc++-$(VER)
DL_FILE = $(THISAPP).tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fde0ee69e3125e982746d9fe005763e1
+$(DL_FILE)_MD5 = ddebf5aafc8525d10366a8724abc9f28
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsigc++-gcc43.patch
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
include Config
-VER = 0.0.0-0db9d7f
+VER = 0.0.0-c02d759
THISAPP = libsolv-$(VER)
DL_FILE = $(THISAPP).tar.gz
PROG = libsolv
DEPS = ""
-PAK_VER = 1
+PAK_VER = 2
###############################################################################
# Top-level Rules
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ba95c404d807bc71297c508a7127a3d9
+$(DL_FILE)_MD5 = a8ba49ca49c309d61836fe78b0e0f83a
install : $(TARGET)
cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt
cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt
- # Make sure that libsatsolverext is linked properly to all needed
- # libraries.
- cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(libsolvext libsolv \$${EXPAT_LIBRARY} \$${ZLIB_LIBRARY})" \
- >> ext/CMakeLists.txt
-
- # Remove the RPM stuff when we build with -DFEDORA=1 because we
- # do not support RPM.
- cd $(DIR_APP) && sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt
-
- # Our version of glibc has no __qsort_r
- cd $(DIR_APP) && echo "#define USE_OWN_QSORT" >> src/util.h
-
cd $(DIR_APP) && mkdir build
- cd $(DIR_APP)/build && cmake .. -DFEDORA=1 \
+ cd $(DIR_APP)/build && cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=1
+ -DCMAKE_SKIP_RPATH=1 \
+ -DENABLE_PERL=0 \
+ -DENABLE_PYTHON=0 \
+ -DENABLE_RUBY=0
cd $(DIR_APP)/build && make $(PARALELLISMFLAGS)
-
cd $(DIR_APP)/build && make install
-
@rm -rf $(DIR_APP)
@$(POSTBUILD)
include Config
-VER = 3.2.27
+VER = 3.2.28
RPI_PATCHES = linux-3.2-bootc-f23da7f
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
-$(DL_FILE)_MD5 = ba14821366a1c055bcd0fe210297d09b
+$(DL_FILE)_MD5 = d387130f084f48fae7b2d1756f6c9257
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 5651c6411bb1cbdbfe4b2908c117aaf3
install : $(TARGET)
ln -svf linux-$(VER) $(DIR_SRC)/linux
- # Apply backported codel patches
- cd $(DIR_APP) && cat $(DIR_SRC)/src/patches/linux-3.2-codel/*.patch | patch -Np1
-
# Linux Intermediate Queueing Device
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-imq.patch
include Config
-VER = 7.7
+VER = 8.31
THISAPP = pcre-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4b2e9cde1f7227448dddba59843efa0b
+$(DL_FILE)_MD5 = fab1bb3b91a4c35398263a5c1e0858c1
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --enable-utf8
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --disable-static \
+ --enable-utf8 \
+ --enable-jit \
+ --enable-unicode-properties
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
- cd $(DIR_APP) && mv -v /usr/lib/libpcre.so.* /lib/
- cd $(DIR_APP) && ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 7.7
+
+THISAPP = pcre-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 4b2e9cde1f7227448dddba59843efa0b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --enable-utf8
+ cd $(DIR_APP) && make $(MAKETUNING)
+
+ install -m 755 $(DIR_APP)/.libs/libpcre.so.0.0.1 /lib
+ ln -svf libpcre.so.0.0.1 /lib/libpcre.so.0
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
###############################################################################
$(TARGET) :
- STRIP="/tools/bin/strip" $(DIR_SRC)/src/stripper /
+ STRIP="/tools/bin/strip" $(DIR_SRC)/src/stripper / \
+ --exclude=/usr/src --exclude=/tools
lfsmake2 perl
lfsmake2 readline
lfsmake2 readline-compat
+ lfsmake2 pcre
+ lfsmake2 pcre-compat
lfsmake2 autoconf
lfsmake2 automake
lfsmake2 bash
# The xen and PAE kernels are only available for x86
if [ "${MACHINE_TYPE}" != "arm" ]; then
- ipfiremake linux2 KCFG="-xen"
+# ipfiremake linux2 KCFG="-xen"
# ipfiremake v4l-dvb KCFG="-xen"
# ipfiremake mISDN KCFG="-xen"
# ipfiremake dahdi KCFG="-xen" KMOD=1
- ipfiremake cryptodev KCFG="-xen"
- ipfiremake compat-wireless KCFG="-xen"
+# ipfiremake cryptodev KCFG="-xen"
+# ipfiremake compat-wireless KCFG="-xen"
# ipfiremake r8169 KCFG="-xen"
# ipfiremake r8168 KCFG="-xen"
# ipfiremake r8101 KCFG="-xen"
--- /dev/null
+From patchwork Mon Jul 30 06:52:21 2012
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: codel: refine one condition to avoid a nul rec_inv_sqrt
+Date: Sun, 29 Jul 2012 20:52:21 -0000
+From: Eric Dumazet <eric.dumazet@gmail.com>
+X-Patchwork-Id: 173968
+Message-Id: <1343631141.2626.13293.camel@edumazet-glaptop>
+To: David Miller <davem@davemloft.net>
+Cc: netdev <netdev@vger.kernel.org>, Anton Mich <lp2s1h@gmail.com>
+
+From: Eric Dumazet <edumazet@google.com>
+
+One condition before codel_Newton_step() was not good if
+we never left the dropping state for a flow. As a result
+rec_inv_sqrt was 0, instead of the ~0 initial value.
+
+codel control law was then set to a very aggressive mode, dropping
+many packets before reaching 'target' and recovering from this problem.
+
+To keep codel_vars_init() as efficient as possible, refine
+the condition to make sure rec_inv_sqrt initial value is correct
+
+Many thanks to Anton Mich for discovering the issue and suggesting
+a fix.
+
+Reported-by: Anton Mich <lp2s1h@gmail.com>
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+
+---
+include/net/codel.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe netdev" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+
+diff --git a/include/net/codel.h b/include/net/codel.h
+index 550debf..389cf62 100644
+--- a/include/net/codel.h
++++ b/include/net/codel.h
+@@ -305,6 +305,8 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+ }
+ }
+ } else if (drop) {
++ u32 delta;
++
+ if (params->ecn && INET_ECN_set_ce(skb)) {
+ stats->ecn_mark++;
+ } else {
+@@ -320,9 +322,11 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+ * assume that the drop rate that controlled the queue on the
+ * last cycle is a good starting point to control it now.
+ */
+- if (codel_time_before(now - vars->drop_next,
++ delta = vars->count - vars->lastcount;
++ if (delta > 1 &&
++ codel_time_before(now - vars->drop_next,
+ 16 * params->interval)) {
+- vars->count = (vars->count - vars->lastcount) | 1;
++ vars->count = delta;
+ /* we dont care if rec_inv_sqrt approximation
+ * is not very precise :
+ * Next Newton steps will correct it quadratically.
--- /dev/null
+diff -urN libsigc++-2.0-2.0.17.old/sigc++/signal.h libsigc++-2.0-2.0.17/sigc++/signal.h
+--- libsigc++-2.0-2.0.17.old/sigc++/signal.h 2005-12-20 08:35:21.000000000 +0000
++++ libsigc++-2.0-2.0.17/sigc++/signal.h 2008-02-22 00:22:44.000000000 +0000
+@@ -1661,7 +1661,7 @@
+ typedef internal::signal_emit0<T_return, T_accumulator> emitter_type;
+ typedef typename emitter_type::result_type result_type;
+ typedef slot<T_return> slot_type;
+- typedef slot_list<slot_type> slot_list_type;
++ typedef sigc::slot_list<slot_type> slot_list_type;
+ typedef typename slot_list_type::iterator iterator;
+ typedef typename slot_list_type::const_iterator const_iterator;
+ typedef typename slot_list_type::reverse_iterator reverse_iterator;
+@@ -1770,7 +1770,7 @@
+ typedef internal::signal_emit1<T_return, T_arg1, T_accumulator> emitter_type;
+ typedef typename emitter_type::result_type result_type;
+ typedef slot<T_return, T_arg1> slot_type;
+- typedef slot_list<slot_type> slot_list_type;
++ typedef sigc::slot_list<slot_type> slot_list_type;
+ typedef typename slot_list_type::iterator iterator;
+ typedef typename slot_list_type::const_iterator const_iterator;
+ typedef typename slot_list_type::reverse_iterator reverse_iterator;
+@@ -1881,7 +1881,7 @@
+ typedef internal::signal_emit2<T_return, T_arg1,T_arg2, T_accumulator> emitter_type;
+ typedef typename emitter_type::result_type result_type;
+ typedef slot<T_return, T_arg1,T_arg2> slot_type;
+- typedef slot_list<slot_type> slot_list_type;
++ typedef sigc::slot_list<slot_type> slot_list_type;
+ typedef typename slot_list_type::iterator iterator;
+ typedef typename slot_list_type::const_iterator const_iterator;
+ typedef typename slot_list_type::reverse_iterator reverse_iterator;
+@@ -1994,7 +1994,7 @@
+ typedef internal::signal_emit3<T_return, T_arg1,T_arg2,T_arg3, T_accumulator> emitter_type;
+ typedef typename emitter_type::result_type result_type;
+ typedef slot<T_return, T_arg1,T_arg2,T_arg3> slot_type;
+- typedef slot_list<slot_type> slot_list_type;
++ typedef sigc::slot_list<slot_type> slot_list_type;
+ typedef typename slot_list_type::iterator iterator;
+ typedef typename slot_list_type::const_iterator const_iterator;
+ typedef typename slot_list_type::reverse_iterator reverse_iterator;
+@@ -2109,7 +2109,7 @@
+ typedef internal::signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, T_accumulator> emitter_type;
+ typedef typename emitter_type::result_type result_type;
+ typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> slot_type;
+- typedef slot_list<slot_type> slot_list_type;
++ typedef sigc::slot_list<slot_type> slot_list_type;
+ typedef typename slot_list_type::iterator iterator;
+ typedef typename slot_list_type::const_iterator const_iterator;
+ typedef typename slot_list_type::reverse_iterator reverse_iterator;
+@@ -2226,7 +2226,7 @@
+ typedef internal::signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, T_accumulator> emitter_type;
+ typedef typename emitter_type::result_type result_type;
+ typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> slot_type;
+- typedef slot_list<slot_type> slot_list_type;
++ typedef sigc::slot_list<slot_type> slot_list_type;
+ typedef typename slot_list_type::iterator iterator;
+ typedef typename slot_list_type::const_iterator const_iterator;
+ typedef typename slot_list_type::reverse_iterator reverse_iterator;
+@@ -2345,7 +2345,7 @@
+ typedef internal::signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, T_accumulator> emitter_type;
+ typedef typename emitter_type::result_type result_type;
+ typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> slot_type;
+- typedef slot_list<slot_type> slot_list_type;
++ typedef sigc::slot_list<slot_type> slot_list_type;
+ typedef typename slot_list_type::iterator iterator;
+ typedef typename slot_list_type::const_iterator const_iterator;
+ typedef typename slot_list_type::reverse_iterator reverse_iterator;
+@@ -2466,7 +2466,7 @@
+ typedef internal::signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, T_accumulator> emitter_type;
+ typedef typename emitter_type::result_type result_type;
+ typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> slot_type;
+- typedef slot_list<slot_type> slot_list_type;
++ typedef sigc::slot_list<slot_type> slot_list_type;
+ typedef typename slot_list_type::iterator iterator;
+ typedef typename slot_list_type::const_iterator const_iterator;
+ typedef typename slot_list_type::reverse_iterator reverse_iterator;
+diff -urN libsigc++-2.0-2.0.17.old/tests/test_copy_invalid_slot.cc libsigc++-2.0-2.0.17/tests/test_copy_invalid_slot.cc
+--- libsigc++-2.0-2.0.17.old/tests/test_copy_invalid_slot.cc 2005-05-01 02:00:47.000000000 +0000
++++ libsigc++-2.0-2.0.17/tests/test_copy_invalid_slot.cc 2008-02-22 00:24:08.000000000 +0000
+@@ -1,4 +1,6 @@
+ #include <iostream>
++#include <cstdlib>
++#include <cstring>
+ #include <sigc++/sigc++.h>
+
+ void Foo(sigc::trackable &t) {}
+++ /dev/null
-From: Eric Dumazet <eric.dumazet@gmail.com>
-Date: Mon, 28 Nov 2011 05:22:18 +0000
-Subject: [PATCH 1/3] net: introduce skb_flow_dissect()
-
-commit 0744dd00c1b1be99a25b62b1b48df440e82e57e0 upstream.
-
-We use at least two flow dissectors in network stack, with known
-limitations and code duplication.
-
-Introduce skb_flow_dissect() to factorize this, highly inspired from
-existing dissector from __skb_get_rxhash()
-
-Note : We extensively use skb_header_pointer(), this permits us to not
-touch skb at all.
-
-Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h
-new file mode 100644
-index 0000000..e4cb285
---- /dev/null
-+++ b/include/net/flow_keys.h
-@@ -0,0 +1,15 @@
-+#ifndef _NET_FLOW_KEYS_H
-+#define _NET_FLOW_KEYS_H
-+
-+struct flow_keys {
-+ __be32 src;
-+ __be32 dst;
-+ union {
-+ __be32 ports;
-+ __be16 port16[2];
-+ };
-+ u8 ip_proto;
-+};
-+
-+extern bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow);
-+#endif
-diff --git a/net/core/Makefile b/net/core/Makefile
-index 3606d40..c4ecc86 100644
---- a/net/core/Makefile
-+++ b/net/core/Makefile
-@@ -3,7 +3,7 @@
- #
-
- obj-y := sock.o request_sock.o skbuff.o iovec.o datagram.o stream.o scm.o \
-- gen_stats.o gen_estimator.o net_namespace.o secure_seq.o
-+ gen_stats.o gen_estimator.o net_namespace.o secure_seq.o flow_dissector.o
-
- obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
-
-diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
-new file mode 100644
-index 0000000..f0516d9
---- /dev/null
-+++ b/net/core/flow_dissector.c
-@@ -0,0 +1,134 @@
-+#include <linux/skbuff.h>
-+#include <linux/ip.h>
-+#include <linux/ipv6.h>
-+#include <linux/if_vlan.h>
-+#include <net/ip.h>
-+#include <linux/if_tunnel.h>
-+#include <linux/if_pppox.h>
-+#include <linux/ppp_defs.h>
-+#include <net/flow_keys.h>
-+
-+
-+bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow)
-+{
-+ int poff, nhoff = skb_network_offset(skb);
-+ u8 ip_proto;
-+ __be16 proto = skb->protocol;
-+
-+ memset(flow, 0, sizeof(*flow));
-+
-+again:
-+ switch (proto) {
-+ case __constant_htons(ETH_P_IP): {
-+ const struct iphdr *iph;
-+ struct iphdr _iph;
-+ip:
-+ iph = skb_header_pointer(skb, nhoff, sizeof(_iph), &_iph);
-+ if (!iph)
-+ return false;
-+
-+ if (ip_is_fragment(iph))
-+ ip_proto = 0;
-+ else
-+ ip_proto = iph->protocol;
-+ flow->src = iph->saddr;
-+ flow->dst = iph->daddr;
-+ nhoff += iph->ihl * 4;
-+ break;
-+ }
-+ case __constant_htons(ETH_P_IPV6): {
-+ const struct ipv6hdr *iph;
-+ struct ipv6hdr _iph;
-+ipv6:
-+ iph = skb_header_pointer(skb, nhoff, sizeof(_iph), &_iph);
-+ if (!iph)
-+ return false;
-+
-+ ip_proto = iph->nexthdr;
-+ flow->src = iph->saddr.s6_addr32[3];
-+ flow->dst = iph->daddr.s6_addr32[3];
-+ nhoff += sizeof(struct ipv6hdr);
-+ break;
-+ }
-+ case __constant_htons(ETH_P_8021Q): {
-+ const struct vlan_hdr *vlan;
-+ struct vlan_hdr _vlan;
-+
-+ vlan = skb_header_pointer(skb, nhoff, sizeof(_vlan), &_vlan);
-+ if (!vlan)
-+ return false;
-+
-+ proto = vlan->h_vlan_encapsulated_proto;
-+ nhoff += sizeof(*vlan);
-+ goto again;
-+ }
-+ case __constant_htons(ETH_P_PPP_SES): {
-+ struct {
-+ struct pppoe_hdr hdr;
-+ __be16 proto;
-+ } *hdr, _hdr;
-+ hdr = skb_header_pointer(skb, nhoff, sizeof(_hdr), &_hdr);
-+ if (!hdr)
-+ return false;
-+ proto = hdr->proto;
-+ nhoff += PPPOE_SES_HLEN;
-+ switch (proto) {
-+ case __constant_htons(PPP_IP):
-+ goto ip;
-+ case __constant_htons(PPP_IPV6):
-+ goto ipv6;
-+ default:
-+ return false;
-+ }
-+ }
-+ default:
-+ return false;
-+ }
-+
-+ switch (ip_proto) {
-+ case IPPROTO_GRE: {
-+ struct gre_hdr {
-+ __be16 flags;
-+ __be16 proto;
-+ } *hdr, _hdr;
-+
-+ hdr = skb_header_pointer(skb, nhoff, sizeof(_hdr), &_hdr);
-+ if (!hdr)
-+ return false;
-+ /*
-+ * Only look inside GRE if version zero and no
-+ * routing
-+ */
-+ if (!(hdr->flags & (GRE_VERSION|GRE_ROUTING))) {
-+ proto = hdr->proto;
-+ nhoff += 4;
-+ if (hdr->flags & GRE_CSUM)
-+ nhoff += 4;
-+ if (hdr->flags & GRE_KEY)
-+ nhoff += 4;
-+ if (hdr->flags & GRE_SEQ)
-+ nhoff += 4;
-+ goto again;
-+ }
-+ break;
-+ }
-+ case IPPROTO_IPIP:
-+ goto again;
-+ default:
-+ break;
-+ }
-+
-+ flow->ip_proto = ip_proto;
-+ poff = proto_ports_offset(ip_proto);
-+ if (poff >= 0) {
-+ __be32 *ports, _ports;
-+
-+ nhoff += poff;
-+ ports = skb_header_pointer(skb, nhoff, sizeof(_ports), &_ports);
-+ if (ports)
-+ flow->ports = *ports;
-+ }
-+
-+ return true;
-+}
-+EXPORT_SYMBOL(skb_flow_dissect);
---
-1.7.10
-
+++ /dev/null
-From: Eric Dumazet <edumazet@google.com>
-Date: Thu, 10 May 2012 07:51:25 +0000
-Subject: [PATCH 1/7] codel: Controlled Delay AQM
-
-commit 76e3cc126bb223013a6b9a0e2a51238d1ef2e409 upstream.
-
-An implementation of CoDel AQM, from Kathleen Nichols and Van Jacobson.
-
-http://queue.acm.org/detail.cfm?id=2209336
-
-This AQM main input is no longer queue size in bytes or packets, but the
-delay packets stay in (FIFO) queue.
-
-As we don't have infinite memory, we still can drop packets in enqueue()
-in case of massive load, but mean of CoDel is to drop packets in
-dequeue(), using a control law based on two simple parameters :
-
-target : target sojourn time (default 5ms)
-interval : width of moving time window (default 100ms)
-
-Based on initial work from Dave Taht.
-
-Refactored to help future codel inclusion as a plugin for other linux
-qdisc (FQ_CODEL, ...), like RED.
-
-include/net/codel.h contains codel algorithm as close as possible than
-Kathleen reference.
-
-net/sched/sch_codel.c contains the linux qdisc specific glue.
-
-Separate structures permit a memory efficient implementation of fq_codel
-(to be sent as a separate work) : Each flow has its own struct
-codel_vars.
-
-timestamps are taken at enqueue() time with 1024 ns precision, allowing
-a range of 2199 seconds in queue, and 100Gb links support. iproute2 uses
-usec as base unit.
-
-Selected packets are dropped, unless ECN is enabled and packets can get
-ECN mark instead.
-
-Tested from 2Mb to 10Gb speeds with no particular problems, on ixgbe and
-tg3 drivers (BQL enabled).
-
-Usage: tc qdisc ... codel [ limit PACKETS ] [ target TIME ]
- [ interval TIME ] [ ecn ]
-
-qdisc codel 10: parent 1:1 limit 2000p target 3.0ms interval 60.0ms ecn
- Sent 13347099587 bytes 8815805 pkt (dropped 0, overlimits 0 requeues 0)
- rate 202365Kbit 16708pps backlog 113550b 75p requeues 0
- count 116 lastcount 98 ldelay 4.3ms dropping drop_next 816us
- maxpacket 1514 ecn_mark 84399 drop_overlimit 0
-
-CoDel must be seen as a base module, and should be used keeping in mind
-there is still a FIFO queue. So a typical setup will probably need a
-hierarchy of several qdiscs and packet classifiers to be able to meet
-whatever constraints a user might have.
-
-One possible example would be to use fq_codel, which combines Fair
-Queueing and CoDel, in replacement of sfq / sfq_red.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: Dave Taht <dave.taht@bufferbloat.net>
-Cc: Kathleen Nichols <nichols@pollere.com>
-Cc: Van Jacobson <van@pollere.net>
-Cc: Tom Herbert <therbert@google.com>
-Cc: Matt Mathis <mattmathis@google.com>
-Cc: Yuchung Cheng <ycheng@google.com>
-Cc: Stephen Hemminger <shemminger@vyatta.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/linux/pkt_sched.h | 26 ++++
- include/net/codel.h | 332 +++++++++++++++++++++++++++++++++++++++++++++
- net/sched/Kconfig | 11 ++
- net/sched/Makefile | 1 +
- net/sched/sch_codel.c | 275 +++++++++++++++++++++++++++++++++++++
- 5 files changed, 645 insertions(+)
- create mode 100644 include/net/codel.h
- create mode 100644 net/sched/sch_codel.c
-
-diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
-index ffe975c..cde56c2 100644
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -655,4 +655,30 @@ struct tc_qfq_stats {
- __u32 lmax;
- };
-
-+/* CODEL */
-+
-+enum {
-+ TCA_CODEL_UNSPEC,
-+ TCA_CODEL_TARGET,
-+ TCA_CODEL_LIMIT,
-+ TCA_CODEL_INTERVAL,
-+ TCA_CODEL_ECN,
-+ __TCA_CODEL_MAX
-+};
-+
-+#define TCA_CODEL_MAX (__TCA_CODEL_MAX - 1)
-+
-+struct tc_codel_xstats {
-+ __u32 maxpacket; /* largest packet we've seen so far */
-+ __u32 count; /* how many drops we've done since the last time we
-+ * entered dropping state
-+ */
-+ __u32 lastcount; /* count at entry to dropping state */
-+ __u32 ldelay; /* in-queue delay seen by most recently dequeued packet */
-+ __s32 drop_next; /* time to drop next packet */
-+ __u32 drop_overlimit; /* number of time max qdisc packet limit was hit */
-+ __u32 ecn_mark; /* number of packets we ECN marked instead of dropped */
-+ __u32 dropping; /* are we in dropping state ? */
-+};
-+
- #endif
-diff --git a/include/net/codel.h b/include/net/codel.h
-new file mode 100644
-index 0000000..bce2cef
---- /dev/null
-+++ b/include/net/codel.h
-@@ -0,0 +1,332 @@
-+#ifndef __NET_SCHED_CODEL_H
-+#define __NET_SCHED_CODEL_H
-+
-+/*
-+ * Codel - The Controlled-Delay Active Queue Management algorithm
-+ *
-+ * Copyright (C) 2011-2012 Kathleen Nichols <nichols@pollere.com>
-+ * Copyright (C) 2011-2012 Van Jacobson <van@pollere.net>
-+ * Copyright (C) 2012 Michael D. Taht <dave.taht@bufferbloat.net>
-+ * Copyright (C) 2012 Eric Dumazet <edumazet@google.com>
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions, and the following disclaimer,
-+ * without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The names of the authors may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * Alternatively, provided that this notice is retained in full, this
-+ * software may be distributed under the terms of the GNU General
-+ * Public License ("GPL") version 2, in which case the provisions of the
-+ * GPL apply INSTEAD OF those given above.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ *
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/ktime.h>
-+#include <linux/skbuff.h>
-+#include <net/pkt_sched.h>
-+#include <net/inet_ecn.h>
-+
-+/* Controlling Queue Delay (CoDel) algorithm
-+ * =========================================
-+ * Source : Kathleen Nichols and Van Jacobson
-+ * http://queue.acm.org/detail.cfm?id=2209336
-+ *
-+ * Implemented on linux by Dave Taht and Eric Dumazet
-+ */
-+
-+
-+/* CoDel uses a 1024 nsec clock, encoded in u32
-+ * This gives a range of 2199 seconds, because of signed compares
-+ */
-+typedef u32 codel_time_t;
-+typedef s32 codel_tdiff_t;
-+#define CODEL_SHIFT 10
-+#define MS2TIME(a) ((a * NSEC_PER_MSEC) >> CODEL_SHIFT)
-+
-+static inline codel_time_t codel_get_time(void)
-+{
-+ u64 ns = ktime_to_ns(ktime_get());
-+
-+ return ns >> CODEL_SHIFT;
-+}
-+
-+#define codel_time_after(a, b) ((s32)(a) - (s32)(b) > 0)
-+#define codel_time_after_eq(a, b) ((s32)(a) - (s32)(b) >= 0)
-+#define codel_time_before(a, b) ((s32)(a) - (s32)(b) < 0)
-+#define codel_time_before_eq(a, b) ((s32)(a) - (s32)(b) <= 0)
-+
-+/* Qdiscs using codel plugin must use codel_skb_cb in their own cb[] */
-+struct codel_skb_cb {
-+ codel_time_t enqueue_time;
-+};
-+
-+static struct codel_skb_cb *get_codel_cb(const struct sk_buff *skb)
-+{
-+ qdisc_cb_private_validate(skb, sizeof(struct codel_skb_cb));
-+ return (struct codel_skb_cb *)qdisc_skb_cb(skb)->data;
-+}
-+
-+static codel_time_t codel_get_enqueue_time(const struct sk_buff *skb)
-+{
-+ return get_codel_cb(skb)->enqueue_time;
-+}
-+
-+static void codel_set_enqueue_time(struct sk_buff *skb)
-+{
-+ get_codel_cb(skb)->enqueue_time = codel_get_time();
-+}
-+
-+static inline u32 codel_time_to_us(codel_time_t val)
-+{
-+ u64 valns = ((u64)val << CODEL_SHIFT);
-+
-+ do_div(valns, NSEC_PER_USEC);
-+ return (u32)valns;
-+}
-+
-+/**
-+ * struct codel_params - contains codel parameters
-+ * @target: target queue size (in time units)
-+ * @interval: width of moving time window
-+ * @ecn: is Explicit Congestion Notification enabled
-+ */
-+struct codel_params {
-+ codel_time_t target;
-+ codel_time_t interval;
-+ bool ecn;
-+};
-+
-+/**
-+ * struct codel_vars - contains codel variables
-+ * @count: how many drops we've done since the last time we
-+ * entered dropping state
-+ * @lastcount: count at entry to dropping state
-+ * @dropping: set to true if in dropping state
-+ * @first_above_time: when we went (or will go) continuously above target
-+ * for interval
-+ * @drop_next: time to drop next packet, or when we dropped last
-+ * @ldelay: sojourn time of last dequeued packet
-+ */
-+struct codel_vars {
-+ u32 count;
-+ u32 lastcount;
-+ bool dropping;
-+ codel_time_t first_above_time;
-+ codel_time_t drop_next;
-+ codel_time_t ldelay;
-+};
-+
-+/**
-+ * struct codel_stats - contains codel shared variables and stats
-+ * @maxpacket: largest packet we've seen so far
-+ * @drop_count: temp count of dropped packets in dequeue()
-+ * ecn_mark: number of packets we ECN marked instead of dropping
-+ */
-+struct codel_stats {
-+ u32 maxpacket;
-+ u32 drop_count;
-+ u32 ecn_mark;
-+};
-+
-+static void codel_params_init(struct codel_params *params)
-+{
-+ params->interval = MS2TIME(100);
-+ params->target = MS2TIME(5);
-+ params->ecn = false;
-+}
-+
-+static void codel_vars_init(struct codel_vars *vars)
-+{
-+ vars->drop_next = 0;
-+ vars->first_above_time = 0;
-+ vars->dropping = false; /* exit dropping state */
-+ vars->count = 0;
-+ vars->lastcount = 0;
-+}
-+
-+static void codel_stats_init(struct codel_stats *stats)
-+{
-+ stats->maxpacket = 256;
-+}
-+
-+/* return interval/sqrt(x) with good precision
-+ * relies on int_sqrt(unsigned long x) kernel implementation
-+ */
-+static u32 codel_inv_sqrt(u32 _interval, u32 _x)
-+{
-+ u64 interval = _interval;
-+ unsigned long x = _x;
-+
-+ /* Scale operands for max precision */
-+
-+#if BITS_PER_LONG == 64
-+ x <<= 32; /* On 64bit arches, we can prescale x by 32bits */
-+ interval <<= 16;
-+#endif
-+
-+ while (x < (1UL << (BITS_PER_LONG - 2))) {
-+ x <<= 2;
-+ interval <<= 1;
-+ }
-+ do_div(interval, int_sqrt(x));
-+ return (u32)interval;
-+}
-+
-+static codel_time_t codel_control_law(codel_time_t t,
-+ codel_time_t interval,
-+ u32 count)
-+{
-+ return t + codel_inv_sqrt(interval, count);
-+}
-+
-+
-+static bool codel_should_drop(struct sk_buff *skb,
-+ unsigned int *backlog,
-+ struct codel_vars *vars,
-+ struct codel_params *params,
-+ struct codel_stats *stats,
-+ codel_time_t now)
-+{
-+ bool ok_to_drop;
-+
-+ if (!skb) {
-+ vars->first_above_time = 0;
-+ return false;
-+ }
-+
-+ vars->ldelay = now - codel_get_enqueue_time(skb);
-+ *backlog -= qdisc_pkt_len(skb);
-+
-+ if (unlikely(qdisc_pkt_len(skb) > stats->maxpacket))
-+ stats->maxpacket = qdisc_pkt_len(skb);
-+
-+ if (codel_time_before(vars->ldelay, params->target) ||
-+ *backlog <= stats->maxpacket) {
-+ /* went below - stay below for at least interval */
-+ vars->first_above_time = 0;
-+ return false;
-+ }
-+ ok_to_drop = false;
-+ if (vars->first_above_time == 0) {
-+ /* just went above from below. If we stay above
-+ * for at least interval we'll say it's ok to drop
-+ */
-+ vars->first_above_time = now + params->interval;
-+ } else if (codel_time_after(now, vars->first_above_time)) {
-+ ok_to_drop = true;
-+ }
-+ return ok_to_drop;
-+}
-+
-+typedef struct sk_buff * (*codel_skb_dequeue_t)(struct codel_vars *vars,
-+ struct Qdisc *sch);
-+
-+static struct sk_buff *codel_dequeue(struct Qdisc *sch,
-+ struct codel_params *params,
-+ struct codel_vars *vars,
-+ struct codel_stats *stats,
-+ codel_skb_dequeue_t dequeue_func,
-+ u32 *backlog)
-+{
-+ struct sk_buff *skb = dequeue_func(vars, sch);
-+ codel_time_t now;
-+ bool drop;
-+
-+ if (!skb) {
-+ vars->dropping = false;
-+ return skb;
-+ }
-+ now = codel_get_time();
-+ drop = codel_should_drop(skb, backlog, vars, params, stats, now);
-+ if (vars->dropping) {
-+ if (!drop) {
-+ /* sojourn time below target - leave dropping state */
-+ vars->dropping = false;
-+ } else if (codel_time_after_eq(now, vars->drop_next)) {
-+ /* It's time for the next drop. Drop the current
-+ * packet and dequeue the next. The dequeue might
-+ * take us out of dropping state.
-+ * If not, schedule the next drop.
-+ * A large backlog might result in drop rates so high
-+ * that the next drop should happen now,
-+ * hence the while loop.
-+ */
-+ while (vars->dropping &&
-+ codel_time_after_eq(now, vars->drop_next)) {
-+ if (++vars->count == 0) /* avoid zero divides */
-+ vars->count = ~0U;
-+ if (params->ecn && INET_ECN_set_ce(skb)) {
-+ stats->ecn_mark++;
-+ vars->drop_next =
-+ codel_control_law(vars->drop_next,
-+ params->interval,
-+ vars->count);
-+ goto end;
-+ }
-+ qdisc_drop(skb, sch);
-+ stats->drop_count++;
-+ skb = dequeue_func(vars, sch);
-+ if (!codel_should_drop(skb, backlog,
-+ vars, params, stats, now)) {
-+ /* leave dropping state */
-+ vars->dropping = false;
-+ } else {
-+ /* and schedule the next drop */
-+ vars->drop_next =
-+ codel_control_law(vars->drop_next,
-+ params->interval,
-+ vars->count);
-+ }
-+ }
-+ }
-+ } else if (drop) {
-+ if (params->ecn && INET_ECN_set_ce(skb)) {
-+ stats->ecn_mark++;
-+ } else {
-+ qdisc_drop(skb, sch);
-+ stats->drop_count++;
-+
-+ skb = dequeue_func(vars, sch);
-+ drop = codel_should_drop(skb, backlog, vars, params,
-+ stats, now);
-+ }
-+ vars->dropping = true;
-+ /* if min went above target close to when we last went below it
-+ * assume that the drop rate that controlled the queue on the
-+ * last cycle is a good starting point to control it now.
-+ */
-+ if (codel_time_before(now - vars->drop_next,
-+ 16 * params->interval)) {
-+ vars->count = (vars->count - vars->lastcount) | 1;
-+ } else {
-+ vars->count = 1;
-+ }
-+ vars->lastcount = vars->count;
-+ vars->drop_next = codel_control_law(now, params->interval,
-+ vars->count);
-+ }
-+end:
-+ return skb;
-+}
-+#endif
-diff --git a/net/sched/Kconfig b/net/sched/Kconfig
-index 75b58f8..fadd252 100644
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -250,6 +250,17 @@ config NET_SCH_QFQ
-
- If unsure, say N.
-
-+config NET_SCH_CODEL
-+ tristate "Controlled Delay AQM (CODEL)"
-+ help
-+ Say Y here if you want to use the Controlled Delay (CODEL)
-+ packet scheduling algorithm.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sch_codel.
-+
-+ If unsure, say N.
-+
- config NET_SCH_INGRESS
- tristate "Ingress Qdisc"
- depends on NET_CLS_ACT
-diff --git a/net/sched/Makefile b/net/sched/Makefile
-index 8cdf4e2..30fab03 100644
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -37,6 +37,7 @@ obj-$(CONFIG_NET_SCH_PLUG) += sch_plug.o
- obj-$(CONFIG_NET_SCH_MQPRIO) += sch_mqprio.o
- obj-$(CONFIG_NET_SCH_CHOKE) += sch_choke.o
- obj-$(CONFIG_NET_SCH_QFQ) += sch_qfq.o
-+obj-$(CONFIG_NET_SCH_CODEL) += sch_codel.o
-
- obj-$(CONFIG_NET_CLS_U32) += cls_u32.o
- obj-$(CONFIG_NET_CLS_ROUTE4) += cls_route.o
-diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
-new file mode 100644
-index 0000000..b4a1a81
---- /dev/null
-+++ b/net/sched/sch_codel.c
-@@ -0,0 +1,275 @@
-+/*
-+ * Codel - The Controlled-Delay Active Queue Management algorithm
-+ *
-+ * Copyright (C) 2011-2012 Kathleen Nichols <nichols@pollere.com>
-+ * Copyright (C) 2011-2012 Van Jacobson <van@pollere.net>
-+ *
-+ * Implemented on linux by :
-+ * Copyright (C) 2012 Michael D. Taht <dave.taht@bufferbloat.net>
-+ * Copyright (C) 2012 Eric Dumazet <edumazet@google.com>
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions, and the following disclaimer,
-+ * without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The names of the authors may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * Alternatively, provided that this notice is retained in full, this
-+ * software may be distributed under the terms of the GNU General
-+ * Public License ("GPL") version 2, in which case the provisions of the
-+ * GPL apply INSTEAD OF those given above.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/skbuff.h>
-+#include <net/pkt_sched.h>
-+#include <net/codel.h>
-+
-+
-+#define DEFAULT_CODEL_LIMIT 1000
-+
-+struct codel_sched_data {
-+ struct codel_params params;
-+ struct codel_vars vars;
-+ struct codel_stats stats;
-+ u32 drop_overlimit;
-+};
-+
-+/* This is the specific function called from codel_dequeue()
-+ * to dequeue a packet from queue. Note: backlog is handled in
-+ * codel, we dont need to reduce it here.
-+ */
-+static struct sk_buff *dequeue(struct codel_vars *vars, struct Qdisc *sch)
-+{
-+ struct sk_buff *skb = __skb_dequeue(&sch->q);
-+
-+ prefetch(&skb->end); /* we'll need skb_shinfo() */
-+ return skb;
-+}
-+
-+static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch)
-+{
-+ struct codel_sched_data *q = qdisc_priv(sch);
-+ struct sk_buff *skb;
-+
-+ skb = codel_dequeue(sch, &q->params, &q->vars, &q->stats,
-+ dequeue, &sch->qstats.backlog);
-+ /* We cant call qdisc_tree_decrease_qlen() if our qlen is 0,
-+ * or HTB crashes. Defer it for next round.
-+ */
-+ if (q->stats.drop_count && sch->q.qlen) {
-+ qdisc_tree_decrease_qlen(sch, q->stats.drop_count);
-+ q->stats.drop_count = 0;
-+ }
-+ if (skb)
-+ qdisc_bstats_update(sch, skb);
-+ return skb;
-+}
-+
-+static int codel_qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
-+{
-+ struct codel_sched_data *q;
-+
-+ if (likely(qdisc_qlen(sch) < sch->limit)) {
-+ codel_set_enqueue_time(skb);
-+ return qdisc_enqueue_tail(skb, sch);
-+ }
-+ q = qdisc_priv(sch);
-+ q->drop_overlimit++;
-+ return qdisc_drop(skb, sch);
-+}
-+
-+static const struct nla_policy codel_policy[TCA_CODEL_MAX + 1] = {
-+ [TCA_CODEL_TARGET] = { .type = NLA_U32 },
-+ [TCA_CODEL_LIMIT] = { .type = NLA_U32 },
-+ [TCA_CODEL_INTERVAL] = { .type = NLA_U32 },
-+ [TCA_CODEL_ECN] = { .type = NLA_U32 },
-+};
-+
-+static int codel_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+ struct codel_sched_data *q = qdisc_priv(sch);
-+ struct nlattr *tb[TCA_CODEL_MAX + 1];
-+ unsigned int qlen;
-+ int err;
-+
-+ if (!opt)
-+ return -EINVAL;
-+
-+ err = nla_parse_nested(tb, TCA_CODEL_MAX, opt, codel_policy);
-+ if (err < 0)
-+ return err;
-+
-+ sch_tree_lock(sch);
-+
-+ if (tb[TCA_CODEL_TARGET]) {
-+ u32 target = nla_get_u32(tb[TCA_CODEL_TARGET]);
-+
-+ q->params.target = ((u64)target * NSEC_PER_USEC) >> CODEL_SHIFT;
-+ }
-+
-+ if (tb[TCA_CODEL_INTERVAL]) {
-+ u32 interval = nla_get_u32(tb[TCA_CODEL_INTERVAL]);
-+
-+ q->params.interval = ((u64)interval * NSEC_PER_USEC) >> CODEL_SHIFT;
-+ }
-+
-+ if (tb[TCA_CODEL_LIMIT])
-+ sch->limit = nla_get_u32(tb[TCA_CODEL_LIMIT]);
-+
-+ if (tb[TCA_CODEL_ECN])
-+ q->params.ecn = !!nla_get_u32(tb[TCA_CODEL_ECN]);
-+
-+ qlen = sch->q.qlen;
-+ while (sch->q.qlen > sch->limit) {
-+ struct sk_buff *skb = __skb_dequeue(&sch->q);
-+
-+ sch->qstats.backlog -= qdisc_pkt_len(skb);
-+ qdisc_drop(skb, sch);
-+ }
-+ qdisc_tree_decrease_qlen(sch, qlen - sch->q.qlen);
-+
-+ sch_tree_unlock(sch);
-+ return 0;
-+}
-+
-+static int codel_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+ struct codel_sched_data *q = qdisc_priv(sch);
-+
-+ sch->limit = DEFAULT_CODEL_LIMIT;
-+
-+ codel_params_init(&q->params);
-+ codel_vars_init(&q->vars);
-+ codel_stats_init(&q->stats);
-+
-+ if (opt) {
-+ int err = codel_change(sch, opt);
-+
-+ if (err)
-+ return err;
-+ }
-+
-+ if (sch->limit >= 1)
-+ sch->flags |= TCQ_F_CAN_BYPASS;
-+ else
-+ sch->flags &= ~TCQ_F_CAN_BYPASS;
-+
-+ return 0;
-+}
-+
-+static int codel_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+ struct codel_sched_data *q = qdisc_priv(sch);
-+ struct nlattr *opts;
-+
-+ opts = nla_nest_start(skb, TCA_OPTIONS);
-+ if (opts == NULL)
-+ goto nla_put_failure;
-+
-+ if (nla_put_u32(skb, TCA_CODEL_TARGET,
-+ codel_time_to_us(q->params.target)) ||
-+ nla_put_u32(skb, TCA_CODEL_LIMIT,
-+ sch->limit) ||
-+ nla_put_u32(skb, TCA_CODEL_INTERVAL,
-+ codel_time_to_us(q->params.interval)) ||
-+ nla_put_u32(skb, TCA_CODEL_ECN,
-+ q->params.ecn))
-+ goto nla_put_failure;
-+
-+ return nla_nest_end(skb, opts);
-+
-+nla_put_failure:
-+ nla_nest_cancel(skb, opts);
-+ return -1;
-+}
-+
-+static int codel_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
-+{
-+ const struct codel_sched_data *q = qdisc_priv(sch);
-+ struct tc_codel_xstats st = {
-+ .maxpacket = q->stats.maxpacket,
-+ .count = q->vars.count,
-+ .lastcount = q->vars.lastcount,
-+ .drop_overlimit = q->drop_overlimit,
-+ .ldelay = codel_time_to_us(q->vars.ldelay),
-+ .dropping = q->vars.dropping,
-+ .ecn_mark = q->stats.ecn_mark,
-+ };
-+
-+ if (q->vars.dropping) {
-+ codel_tdiff_t delta = q->vars.drop_next - codel_get_time();
-+
-+ if (delta >= 0)
-+ st.drop_next = codel_time_to_us(delta);
-+ else
-+ st.drop_next = -codel_time_to_us(-delta);
-+ }
-+
-+ return gnet_stats_copy_app(d, &st, sizeof(st));
-+}
-+
-+static void codel_reset(struct Qdisc *sch)
-+{
-+ struct codel_sched_data *q = qdisc_priv(sch);
-+
-+ qdisc_reset_queue(sch);
-+ codel_vars_init(&q->vars);
-+}
-+
-+static struct Qdisc_ops codel_qdisc_ops __read_mostly = {
-+ .id = "codel",
-+ .priv_size = sizeof(struct codel_sched_data),
-+
-+ .enqueue = codel_qdisc_enqueue,
-+ .dequeue = codel_qdisc_dequeue,
-+ .peek = qdisc_peek_dequeued,
-+ .init = codel_init,
-+ .reset = codel_reset,
-+ .change = codel_change,
-+ .dump = codel_dump,
-+ .dump_stats = codel_dump_stats,
-+ .owner = THIS_MODULE,
-+};
-+
-+static int __init codel_module_init(void)
-+{
-+ return register_qdisc(&codel_qdisc_ops);
-+}
-+
-+static void __exit codel_module_exit(void)
-+{
-+ unregister_qdisc(&codel_qdisc_ops);
-+}
-+
-+module_init(codel_module_init)
-+module_exit(codel_module_exit)
-+
-+MODULE_DESCRIPTION("Controlled Delay queue discipline");
-+MODULE_AUTHOR("Dave Taht");
-+MODULE_AUTHOR("Eric Dumazet");
-+MODULE_LICENSE("Dual BSD/GPL");
---
-1.7.10
-
+++ /dev/null
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 12 May 2012 03:32:13 +0000
-Subject: [PATCH 2/7] codel: use Newton method instead of sqrt() and divides
-
-commit 536edd67109df5e0cdb2c4ee759e9bade7976367 upstream.
-
-As Van pointed out, interval/sqrt(count) can be implemented using
-multiplies only.
-
-http://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Iterative_methods_for_reciprocal_square_roots
-
-This patch implements the Newton method and reciprocal divide.
-
-Total cost is 15 cycles instead of 120 on my Corei5 machine (64bit
-kernel).
-
-There is a small 'error' for count values < 5, but we don't really care.
-
-I reuse a hole in struct codel_vars :
- - pack the dropping boolean into one bit
- - use 31bit to store the reciprocal value of sqrt(count).
-
-Suggested-by: Van Jacobson <van@pollere.net>
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Cc: Dave Taht <dave.taht@bufferbloat.net>
-Cc: Kathleen Nichols <nichols@pollere.com>
-Cc: Tom Herbert <therbert@google.com>
-Cc: Matt Mathis <mattmathis@google.com>
-Cc: Yuchung Cheng <ycheng@google.com>
-Cc: Nandita Dukkipati <nanditad@google.com>
-Cc: Stephen Hemminger <shemminger@vyatta.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/net/codel.h | 68 ++++++++++++++++++++++++++++-----------------------
- 1 file changed, 37 insertions(+), 31 deletions(-)
-
-diff --git a/include/net/codel.h b/include/net/codel.h
-index bce2cef..bd8747c 100644
---- a/include/net/codel.h
-+++ b/include/net/codel.h
-@@ -46,6 +46,7 @@
- #include <linux/skbuff.h>
- #include <net/pkt_sched.h>
- #include <net/inet_ecn.h>
-+#include <linux/reciprocal_div.h>
-
- /* Controlling Queue Delay (CoDel) algorithm
- * =========================================
-@@ -123,6 +124,7 @@ struct codel_params {
- * entered dropping state
- * @lastcount: count at entry to dropping state
- * @dropping: set to true if in dropping state
-+ * @rec_inv_sqrt: reciprocal value of sqrt(count) >> 1
- * @first_above_time: when we went (or will go) continuously above target
- * for interval
- * @drop_next: time to drop next packet, or when we dropped last
-@@ -131,7 +133,8 @@ struct codel_params {
- struct codel_vars {
- u32 count;
- u32 lastcount;
-- bool dropping;
-+ bool dropping:1;
-+ u32 rec_inv_sqrt:31;
- codel_time_t first_above_time;
- codel_time_t drop_next;
- codel_time_t ldelay;
-@@ -158,11 +161,7 @@ static void codel_params_init(struct codel_params *params)
-
- static void codel_vars_init(struct codel_vars *vars)
- {
-- vars->drop_next = 0;
-- vars->first_above_time = 0;
-- vars->dropping = false; /* exit dropping state */
-- vars->count = 0;
-- vars->lastcount = 0;
-+ memset(vars, 0, sizeof(*vars));
- }
-
- static void codel_stats_init(struct codel_stats *stats)
-@@ -170,38 +169,37 @@ static void codel_stats_init(struct codel_stats *stats)
- stats->maxpacket = 256;
- }
-
--/* return interval/sqrt(x) with good precision
-- * relies on int_sqrt(unsigned long x) kernel implementation
-+/*
-+ * http://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Iterative_methods_for_reciprocal_square_roots
-+ * new_invsqrt = (invsqrt / 2) * (3 - count * invsqrt^2)
-+ *
-+ * Here, invsqrt is a fixed point number (< 1.0), 31bit mantissa)
- */
--static u32 codel_inv_sqrt(u32 _interval, u32 _x)
-+static void codel_Newton_step(struct codel_vars *vars)
- {
-- u64 interval = _interval;
-- unsigned long x = _x;
-+ u32 invsqrt = vars->rec_inv_sqrt;
-+ u32 invsqrt2 = ((u64)invsqrt * invsqrt) >> 31;
-+ u64 val = (3LL << 31) - ((u64)vars->count * invsqrt2);
-
-- /* Scale operands for max precision */
--
--#if BITS_PER_LONG == 64
-- x <<= 32; /* On 64bit arches, we can prescale x by 32bits */
-- interval <<= 16;
--#endif
-+ val = (val * invsqrt) >> 32;
-
-- while (x < (1UL << (BITS_PER_LONG - 2))) {
-- x <<= 2;
-- interval <<= 1;
-- }
-- do_div(interval, int_sqrt(x));
-- return (u32)interval;
-+ vars->rec_inv_sqrt = val;
- }
-
-+/*
-+ * CoDel control_law is t + interval/sqrt(count)
-+ * We maintain in rec_inv_sqrt the reciprocal value of sqrt(count) to avoid
-+ * both sqrt() and divide operation.
-+ */
- static codel_time_t codel_control_law(codel_time_t t,
- codel_time_t interval,
-- u32 count)
-+ u32 rec_inv_sqrt)
- {
-- return t + codel_inv_sqrt(interval, count);
-+ return t + reciprocal_divide(interval, rec_inv_sqrt << 1);
- }
-
-
--static bool codel_should_drop(struct sk_buff *skb,
-+static bool codel_should_drop(const struct sk_buff *skb,
- unsigned int *backlog,
- struct codel_vars *vars,
- struct codel_params *params,
-@@ -274,14 +272,16 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
- */
- while (vars->dropping &&
- codel_time_after_eq(now, vars->drop_next)) {
-- if (++vars->count == 0) /* avoid zero divides */
-- vars->count = ~0U;
-+ vars->count++; /* dont care of possible wrap
-+ * since there is no more divide
-+ */
-+ codel_Newton_step(vars);
- if (params->ecn && INET_ECN_set_ce(skb)) {
- stats->ecn_mark++;
- vars->drop_next =
- codel_control_law(vars->drop_next,
- params->interval,
-- vars->count);
-+ vars->rec_inv_sqrt);
- goto end;
- }
- qdisc_drop(skb, sch);
-@@ -296,7 +296,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
- vars->drop_next =
- codel_control_law(vars->drop_next,
- params->interval,
-- vars->count);
-+ vars->rec_inv_sqrt);
- }
- }
- }
-@@ -319,12 +319,18 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
- if (codel_time_before(now - vars->drop_next,
- 16 * params->interval)) {
- vars->count = (vars->count - vars->lastcount) | 1;
-+ /* we dont care if rec_inv_sqrt approximation
-+ * is not very precise :
-+ * Next Newton steps will correct it quadratically.
-+ */
-+ codel_Newton_step(vars);
- } else {
- vars->count = 1;
-+ vars->rec_inv_sqrt = 0x7fffffff;
- }
- vars->lastcount = vars->count;
- vars->drop_next = codel_control_law(now, params->interval,
-- vars->count);
-+ vars->rec_inv_sqrt);
- }
- end:
- return skb;
---
-1.7.10
-
+++ /dev/null
-From: Eric Dumazet <edumazet@google.com>
-Date: Fri, 11 May 2012 09:30:50 +0000
-Subject: [PATCH 3/7] fq_codel: Fair Queue Codel AQM
-
-commit 4b549a2ef4bef9965d97cbd992ba67930cd3e0fe upstream.
-
-Fair Queue Codel packet scheduler
-
-Principles :
-
-- Packets are classified (internal classifier or external) on flows.
-- This is a Stochastic model (as we use a hash, several flows might
- be hashed on same slot)
-- Each flow has a CoDel managed queue.
-- Flows are linked onto two (Round Robin) lists,
- so that new flows have priority on old ones.
-
-- For a given flow, packets are not reordered (CoDel uses a FIFO)
-- head drops only.
-- ECN capability is on by default.
-- Very low memory footprint (64 bytes per flow)
-
-tc qdisc ... fq_codel [ limit PACKETS ] [ flows number ]
- [ target TIME ] [ interval TIME ] [ noecn ]
- [ quantum BYTES ]
-
-defaults : 1024 flows, 10240 packets limit, quantum : device MTU
- target : 5ms (CoDel default)
- interval : 100ms (CoDel default)
-
-Impressive results on load :
-
-class htb 1:1 root leaf 10: prio 0 quantum 1514 rate 200000Kbit ceil 200000Kbit burst 1475b/8 mpu 0b overhead 0b cburst 1475b/8 mpu 0b overhead 0b level 0
- Sent 43304920109 bytes 33063109 pkt (dropped 0, overlimits 0 requeues 0)
- rate 201691Kbit 28595pps backlog 0b 312p requeues 0
- lended: 33063109 borrowed: 0 giants: 0
- tokens: -912 ctokens: -912
-
-class fq_codel 10:1735 parent 10:
- (dropped 1292, overlimits 0 requeues 0)
- backlog 15140b 10p requeues 0
- deficit 1514 count 1 lastcount 1 ldelay 7.1ms
-class fq_codel 10:4524 parent 10:
- (dropped 1291, overlimits 0 requeues 0)
- backlog 16654b 11p requeues 0
- deficit 1514 count 1 lastcount 1 ldelay 7.1ms
-class fq_codel 10:4e74 parent 10:
- (dropped 1290, overlimits 0 requeues 0)
- backlog 6056b 4p requeues 0
- deficit 1514 count 1 lastcount 1 ldelay 6.4ms dropping drop_next 92.0ms
-class fq_codel 10:628a parent 10:
- (dropped 1289, overlimits 0 requeues 0)
- backlog 7570b 5p requeues 0
- deficit 1514 count 1 lastcount 1 ldelay 5.4ms dropping drop_next 90.9ms
-class fq_codel 10:a4b3 parent 10:
- (dropped 302, overlimits 0 requeues 0)
- backlog 16654b 11p requeues 0
- deficit 1514 count 1 lastcount 1 ldelay 7.1ms
-class fq_codel 10:c3c2 parent 10:
- (dropped 1284, overlimits 0 requeues 0)
- backlog 13626b 9p requeues 0
- deficit 1514 count 1 lastcount 1 ldelay 5.9ms
-class fq_codel 10:d331 parent 10:
- (dropped 299, overlimits 0 requeues 0)
- backlog 15140b 10p requeues 0
- deficit 1514 count 1 lastcount 1 ldelay 7.0ms
-class fq_codel 10:d526 parent 10:
- (dropped 12160, overlimits 0 requeues 0)
- backlog 35870b 211p requeues 0
- deficit 1508 count 12160 lastcount 1 ldelay 15.3ms dropping drop_next 247us
-class fq_codel 10:e2c6 parent 10:
- (dropped 1288, overlimits 0 requeues 0)
- backlog 15140b 10p requeues 0
- deficit 1514 count 1 lastcount 1 ldelay 7.1ms
-class fq_codel 10:eab5 parent 10:
- (dropped 1285, overlimits 0 requeues 0)
- backlog 16654b 11p requeues 0
- deficit 1514 count 1 lastcount 1 ldelay 5.9ms
-class fq_codel 10:f220 parent 10:
- (dropped 1289, overlimits 0 requeues 0)
- backlog 15140b 10p requeues 0
- deficit 1514 count 1 lastcount 1 ldelay 7.1ms
-
-qdisc htb 1: root refcnt 6 r2q 10 default 1 direct_packets_stat 0 ver 3.17
- Sent 43331086547 bytes 33092812 pkt (dropped 0, overlimits 66063544 requeues 71)
- rate 201697Kbit 28602pps backlog 0b 260p requeues 71
-qdisc fq_codel 10: parent 1:1 limit 10240p flows 65536 target 5.0ms interval 100.0ms ecn
- Sent 43331086547 bytes 33092812 pkt (dropped 949359, overlimits 0 requeues 0)
- rate 201697Kbit 28602pps backlog 189352b 260p requeues 0
- maxpacket 1514 drop_overlimit 0 new_flow_count 5582 ecn_mark 125593
- new_flows_len 0 old_flows_len 11
-
-PING 172.30.42.18 (172.30.42.18) 56(84) bytes of data.
-64 bytes from 172.30.42.18: icmp_req=1 ttl=64 time=0.227 ms
-64 bytes from 172.30.42.18: icmp_req=2 ttl=64 time=0.165 ms
-64 bytes from 172.30.42.18: icmp_req=3 ttl=64 time=0.166 ms
-64 bytes from 172.30.42.18: icmp_req=4 ttl=64 time=0.151 ms
-64 bytes from 172.30.42.18: icmp_req=5 ttl=64 time=0.164 ms
-64 bytes from 172.30.42.18: icmp_req=6 ttl=64 time=0.172 ms
-64 bytes from 172.30.42.18: icmp_req=7 ttl=64 time=0.175 ms
-64 bytes from 172.30.42.18: icmp_req=8 ttl=64 time=0.183 ms
-64 bytes from 172.30.42.18: icmp_req=9 ttl=64 time=0.158 ms
-64 bytes from 172.30.42.18: icmp_req=10 ttl=64 time=0.200 ms
-
-10 packets transmitted, 10 received, 0% packet loss, time 8999ms
-rtt min/avg/max/mdev = 0.151/0.176/0.227/0.022 ms
-
-Much better than SFQ because of priority given to new flows, and fast
-path dirtying less cache lines.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/linux/pkt_sched.h | 54 ++++
- net/sched/Kconfig | 11 +
- net/sched/Makefile | 1 +
- net/sched/sch_fq_codel.c | 624 +++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 690 insertions(+)
- create mode 100644 net/sched/sch_fq_codel.c
-
-diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
-index cde56c2..32aef0a 100644
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -681,4 +681,58 @@ struct tc_codel_xstats {
- __u32 dropping; /* are we in dropping state ? */
- };
-
-+/* FQ_CODEL */
-+
-+enum {
-+ TCA_FQ_CODEL_UNSPEC,
-+ TCA_FQ_CODEL_TARGET,
-+ TCA_FQ_CODEL_LIMIT,
-+ TCA_FQ_CODEL_INTERVAL,
-+ TCA_FQ_CODEL_ECN,
-+ TCA_FQ_CODEL_FLOWS,
-+ TCA_FQ_CODEL_QUANTUM,
-+ __TCA_FQ_CODEL_MAX
-+};
-+
-+#define TCA_FQ_CODEL_MAX (__TCA_FQ_CODEL_MAX - 1)
-+
-+enum {
-+ TCA_FQ_CODEL_XSTATS_QDISC,
-+ TCA_FQ_CODEL_XSTATS_CLASS,
-+};
-+
-+struct tc_fq_codel_qd_stats {
-+ __u32 maxpacket; /* largest packet we've seen so far */
-+ __u32 drop_overlimit; /* number of time max qdisc
-+ * packet limit was hit
-+ */
-+ __u32 ecn_mark; /* number of packets we ECN marked
-+ * instead of being dropped
-+ */
-+ __u32 new_flow_count; /* number of time packets
-+ * created a 'new flow'
-+ */
-+ __u32 new_flows_len; /* count of flows in new list */
-+ __u32 old_flows_len; /* count of flows in old list */
-+};
-+
-+struct tc_fq_codel_cl_stats {
-+ __s32 deficit;
-+ __u32 ldelay; /* in-queue delay seen by most recently
-+ * dequeued packet
-+ */
-+ __u32 count;
-+ __u32 lastcount;
-+ __u32 dropping;
-+ __s32 drop_next;
-+};
-+
-+struct tc_fq_codel_xstats {
-+ __u32 type;
-+ union {
-+ struct tc_fq_codel_qd_stats qdisc_stats;
-+ struct tc_fq_codel_cl_stats class_stats;
-+ };
-+};
-+
- #endif
-diff --git a/net/sched/Kconfig b/net/sched/Kconfig
-index fadd252..e7a8976 100644
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -261,6 +261,17 @@ config NET_SCH_CODEL
-
- If unsure, say N.
-
-+config NET_SCH_FQ_CODEL
-+ tristate "Fair Queue Controlled Delay AQM (FQ_CODEL)"
-+ help
-+ Say Y here if you want to use the FQ Controlled Delay (FQ_CODEL)
-+ packet scheduling algorithm.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called sch_fq_codel.
-+
-+ If unsure, say N.
-+
- config NET_SCH_INGRESS
- tristate "Ingress Qdisc"
- depends on NET_CLS_ACT
-diff --git a/net/sched/Makefile b/net/sched/Makefile
-index 30fab03..5940a19 100644
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -38,6 +38,7 @@ obj-$(CONFIG_NET_SCH_MQPRIO) += sch_mqprio.o
- obj-$(CONFIG_NET_SCH_CHOKE) += sch_choke.o
- obj-$(CONFIG_NET_SCH_QFQ) += sch_qfq.o
- obj-$(CONFIG_NET_SCH_CODEL) += sch_codel.o
-+obj-$(CONFIG_NET_SCH_FQ_CODEL) += sch_fq_codel.o
-
- obj-$(CONFIG_NET_CLS_U32) += cls_u32.o
- obj-$(CONFIG_NET_CLS_ROUTE4) += cls_route.o
-diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
-new file mode 100644
-index 0000000..a7b3754
---- /dev/null
-+++ b/net/sched/sch_fq_codel.c
-@@ -0,0 +1,624 @@
-+/*
-+ * Fair Queue CoDel discipline
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ *
-+ * Copyright (C) 2012 Eric Dumazet <edumazet@google.com>
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/skbuff.h>
-+#include <linux/jhash.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <net/netlink.h>
-+#include <net/pkt_sched.h>
-+#include <net/flow_keys.h>
-+#include <net/codel.h>
-+
-+/* Fair Queue CoDel.
-+ *
-+ * Principles :
-+ * Packets are classified (internal classifier or external) on flows.
-+ * This is a Stochastic model (as we use a hash, several flows
-+ * might be hashed on same slot)
-+ * Each flow has a CoDel managed queue.
-+ * Flows are linked onto two (Round Robin) lists,
-+ * so that new flows have priority on old ones.
-+ *
-+ * For a given flow, packets are not reordered (CoDel uses a FIFO)
-+ * head drops only.
-+ * ECN capability is on by default.
-+ * Low memory footprint (64 bytes per flow)
-+ */
-+
-+struct fq_codel_flow {
-+ struct sk_buff *head;
-+ struct sk_buff *tail;
-+ struct list_head flowchain;
-+ int deficit;
-+ u32 dropped; /* number of drops (or ECN marks) on this flow */
-+ struct codel_vars cvars;
-+}; /* please try to keep this structure <= 64 bytes */
-+
-+struct fq_codel_sched_data {
-+ struct tcf_proto *filter_list; /* optional external classifier */
-+ struct fq_codel_flow *flows; /* Flows table [flows_cnt] */
-+ u32 *backlogs; /* backlog table [flows_cnt] */
-+ u32 flows_cnt; /* number of flows */
-+ u32 perturbation; /* hash perturbation */
-+ u32 quantum; /* psched_mtu(qdisc_dev(sch)); */
-+ struct codel_params cparams;
-+ struct codel_stats cstats;
-+ u32 drop_overlimit;
-+ u32 new_flow_count;
-+
-+ struct list_head new_flows; /* list of new flows */
-+ struct list_head old_flows; /* list of old flows */
-+};
-+
-+static unsigned int fq_codel_hash(const struct fq_codel_sched_data *q,
-+ const struct sk_buff *skb)
-+{
-+ struct flow_keys keys;
-+ unsigned int hash;
-+
-+ skb_flow_dissect(skb, &keys);
-+ hash = jhash_3words((__force u32)keys.dst,
-+ (__force u32)keys.src ^ keys.ip_proto,
-+ (__force u32)keys.ports, q->perturbation);
-+ return ((u64)hash * q->flows_cnt) >> 32;
-+}
-+
-+static unsigned int fq_codel_classify(struct sk_buff *skb, struct Qdisc *sch,
-+ int *qerr)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+ struct tcf_result res;
-+ int result;
-+
-+ if (TC_H_MAJ(skb->priority) == sch->handle &&
-+ TC_H_MIN(skb->priority) > 0 &&
-+ TC_H_MIN(skb->priority) <= q->flows_cnt)
-+ return TC_H_MIN(skb->priority);
-+
-+ if (!q->filter_list)
-+ return fq_codel_hash(q, skb) + 1;
-+
-+ *qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
-+ result = tc_classify(skb, q->filter_list, &res);
-+ if (result >= 0) {
-+#ifdef CONFIG_NET_CLS_ACT
-+ switch (result) {
-+ case TC_ACT_STOLEN:
-+ case TC_ACT_QUEUED:
-+ *qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-+ case TC_ACT_SHOT:
-+ return 0;
-+ }
-+#endif
-+ if (TC_H_MIN(res.classid) <= q->flows_cnt)
-+ return TC_H_MIN(res.classid);
-+ }
-+ return 0;
-+}
-+
-+/* helper functions : might be changed when/if skb use a standard list_head */
-+
-+/* remove one skb from head of slot queue */
-+static inline struct sk_buff *dequeue_head(struct fq_codel_flow *flow)
-+{
-+ struct sk_buff *skb = flow->head;
-+
-+ flow->head = skb->next;
-+ skb->next = NULL;
-+ return skb;
-+}
-+
-+/* add skb to flow queue (tail add) */
-+static inline void flow_queue_add(struct fq_codel_flow *flow,
-+ struct sk_buff *skb)
-+{
-+ if (flow->head == NULL)
-+ flow->head = skb;
-+ else
-+ flow->tail->next = skb;
-+ flow->tail = skb;
-+ skb->next = NULL;
-+}
-+
-+static unsigned int fq_codel_drop(struct Qdisc *sch)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+ struct sk_buff *skb;
-+ unsigned int maxbacklog = 0, idx = 0, i, len;
-+ struct fq_codel_flow *flow;
-+
-+ /* Queue is full! Find the fat flow and drop packet from it.
-+ * This might sound expensive, but with 1024 flows, we scan
-+ * 4KB of memory, and we dont need to handle a complex tree
-+ * in fast path (packet queue/enqueue) with many cache misses.
-+ */
-+ for (i = 0; i < q->flows_cnt; i++) {
-+ if (q->backlogs[i] > maxbacklog) {
-+ maxbacklog = q->backlogs[i];
-+ idx = i;
-+ }
-+ }
-+ flow = &q->flows[idx];
-+ skb = dequeue_head(flow);
-+ len = qdisc_pkt_len(skb);
-+ q->backlogs[idx] -= len;
-+ kfree_skb(skb);
-+ sch->q.qlen--;
-+ sch->qstats.drops++;
-+ sch->qstats.backlog -= len;
-+ flow->dropped++;
-+ return idx;
-+}
-+
-+static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+ unsigned int idx;
-+ struct fq_codel_flow *flow;
-+ int uninitialized_var(ret);
-+
-+ idx = fq_codel_classify(skb, sch, &ret);
-+ if (idx == 0) {
-+ if (ret & __NET_XMIT_BYPASS)
-+ sch->qstats.drops++;
-+ kfree_skb(skb);
-+ return ret;
-+ }
-+ idx--;
-+
-+ codel_set_enqueue_time(skb);
-+ flow = &q->flows[idx];
-+ flow_queue_add(flow, skb);
-+ q->backlogs[idx] += qdisc_pkt_len(skb);
-+ sch->qstats.backlog += qdisc_pkt_len(skb);
-+
-+ if (list_empty(&flow->flowchain)) {
-+ list_add_tail(&flow->flowchain, &q->new_flows);
-+ codel_vars_init(&flow->cvars);
-+ q->new_flow_count++;
-+ flow->deficit = q->quantum;
-+ flow->dropped = 0;
-+ }
-+ if (++sch->q.qlen < sch->limit)
-+ return NET_XMIT_SUCCESS;
-+
-+ q->drop_overlimit++;
-+ /* Return Congestion Notification only if we dropped a packet
-+ * from this flow.
-+ */
-+ if (fq_codel_drop(sch) == idx)
-+ return NET_XMIT_CN;
-+
-+ /* As we dropped a packet, better let upper stack know this */
-+ qdisc_tree_decrease_qlen(sch, 1);
-+ return NET_XMIT_SUCCESS;
-+}
-+
-+/* This is the specific function called from codel_dequeue()
-+ * to dequeue a packet from queue. Note: backlog is handled in
-+ * codel, we dont need to reduce it here.
-+ */
-+static struct sk_buff *dequeue(struct codel_vars *vars, struct Qdisc *sch)
-+{
-+ struct fq_codel_flow *flow;
-+ struct sk_buff *skb = NULL;
-+
-+ flow = container_of(vars, struct fq_codel_flow, cvars);
-+ if (flow->head) {
-+ skb = dequeue_head(flow);
-+ sch->qstats.backlog -= qdisc_pkt_len(skb);
-+ sch->q.qlen--;
-+ }
-+ return skb;
-+}
-+
-+static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+ struct sk_buff *skb;
-+ struct fq_codel_flow *flow;
-+ struct list_head *head;
-+ u32 prev_drop_count, prev_ecn_mark;
-+
-+begin:
-+ head = &q->new_flows;
-+ if (list_empty(head)) {
-+ head = &q->old_flows;
-+ if (list_empty(head))
-+ return NULL;
-+ }
-+ flow = list_first_entry(head, struct fq_codel_flow, flowchain);
-+
-+ if (flow->deficit <= 0) {
-+ flow->deficit += q->quantum;
-+ list_move_tail(&flow->flowchain, &q->old_flows);
-+ goto begin;
-+ }
-+
-+ prev_drop_count = q->cstats.drop_count;
-+ prev_ecn_mark = q->cstats.ecn_mark;
-+
-+ skb = codel_dequeue(sch, &q->cparams, &flow->cvars, &q->cstats,
-+ dequeue, &q->backlogs[flow - q->flows]);
-+
-+ flow->dropped += q->cstats.drop_count - prev_drop_count;
-+ flow->dropped += q->cstats.ecn_mark - prev_ecn_mark;
-+
-+ if (!skb) {
-+ /* force a pass through old_flows to prevent starvation */
-+ if ((head == &q->new_flows) && !list_empty(&q->old_flows))
-+ list_move_tail(&flow->flowchain, &q->old_flows);
-+ else
-+ list_del_init(&flow->flowchain);
-+ goto begin;
-+ }
-+ qdisc_bstats_update(sch, skb);
-+ flow->deficit -= qdisc_pkt_len(skb);
-+ /* We cant call qdisc_tree_decrease_qlen() if our qlen is 0,
-+ * or HTB crashes. Defer it for next round.
-+ */
-+ if (q->cstats.drop_count && sch->q.qlen) {
-+ qdisc_tree_decrease_qlen(sch, q->cstats.drop_count);
-+ q->cstats.drop_count = 0;
-+ }
-+ return skb;
-+}
-+
-+static void fq_codel_reset(struct Qdisc *sch)
-+{
-+ struct sk_buff *skb;
-+
-+ while ((skb = fq_codel_dequeue(sch)) != NULL)
-+ kfree_skb(skb);
-+}
-+
-+static const struct nla_policy fq_codel_policy[TCA_FQ_CODEL_MAX + 1] = {
-+ [TCA_FQ_CODEL_TARGET] = { .type = NLA_U32 },
-+ [TCA_FQ_CODEL_LIMIT] = { .type = NLA_U32 },
-+ [TCA_FQ_CODEL_INTERVAL] = { .type = NLA_U32 },
-+ [TCA_FQ_CODEL_ECN] = { .type = NLA_U32 },
-+ [TCA_FQ_CODEL_FLOWS] = { .type = NLA_U32 },
-+ [TCA_FQ_CODEL_QUANTUM] = { .type = NLA_U32 },
-+};
-+
-+static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+ struct nlattr *tb[TCA_FQ_CODEL_MAX + 1];
-+ int err;
-+
-+ if (!opt)
-+ return -EINVAL;
-+
-+ err = nla_parse_nested(tb, TCA_FQ_CODEL_MAX, opt, fq_codel_policy);
-+ if (err < 0)
-+ return err;
-+ if (tb[TCA_FQ_CODEL_FLOWS]) {
-+ if (q->flows)
-+ return -EINVAL;
-+ q->flows_cnt = nla_get_u32(tb[TCA_FQ_CODEL_FLOWS]);
-+ if (!q->flows_cnt ||
-+ q->flows_cnt > 65536)
-+ return -EINVAL;
-+ }
-+ sch_tree_lock(sch);
-+
-+ if (tb[TCA_FQ_CODEL_TARGET]) {
-+ u64 target = nla_get_u32(tb[TCA_FQ_CODEL_TARGET]);
-+
-+ q->cparams.target = (target * NSEC_PER_USEC) >> CODEL_SHIFT;
-+ }
-+
-+ if (tb[TCA_FQ_CODEL_INTERVAL]) {
-+ u64 interval = nla_get_u32(tb[TCA_FQ_CODEL_INTERVAL]);
-+
-+ q->cparams.interval = (interval * NSEC_PER_USEC) >> CODEL_SHIFT;
-+ }
-+
-+ if (tb[TCA_FQ_CODEL_LIMIT])
-+ sch->limit = nla_get_u32(tb[TCA_FQ_CODEL_LIMIT]);
-+
-+ if (tb[TCA_FQ_CODEL_ECN])
-+ q->cparams.ecn = !!nla_get_u32(tb[TCA_FQ_CODEL_ECN]);
-+
-+ if (tb[TCA_FQ_CODEL_QUANTUM])
-+ q->quantum = max(256U, nla_get_u32(tb[TCA_FQ_CODEL_QUANTUM]));
-+
-+ while (sch->q.qlen > sch->limit) {
-+ struct sk_buff *skb = fq_codel_dequeue(sch);
-+
-+ kfree_skb(skb);
-+ q->cstats.drop_count++;
-+ }
-+ qdisc_tree_decrease_qlen(sch, q->cstats.drop_count);
-+ q->cstats.drop_count = 0;
-+
-+ sch_tree_unlock(sch);
-+ return 0;
-+}
-+
-+static void *fq_codel_zalloc(size_t sz)
-+{
-+ void *ptr = kzalloc(sz, GFP_KERNEL | __GFP_NOWARN);
-+
-+ if (!ptr)
-+ ptr = vzalloc(sz);
-+ return ptr;
-+}
-+
-+static void fq_codel_free(void *addr)
-+{
-+ if (addr) {
-+ if (is_vmalloc_addr(addr))
-+ vfree(addr);
-+ else
-+ kfree(addr);
-+ }
-+}
-+
-+static void fq_codel_destroy(struct Qdisc *sch)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+
-+ tcf_destroy_chain(&q->filter_list);
-+ fq_codel_free(q->backlogs);
-+ fq_codel_free(q->flows);
-+}
-+
-+static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+ int i;
-+
-+ sch->limit = 10*1024;
-+ q->flows_cnt = 1024;
-+ q->quantum = psched_mtu(qdisc_dev(sch));
-+ q->perturbation = net_random();
-+ INIT_LIST_HEAD(&q->new_flows);
-+ INIT_LIST_HEAD(&q->old_flows);
-+ codel_params_init(&q->cparams);
-+ codel_stats_init(&q->cstats);
-+ q->cparams.ecn = true;
-+
-+ if (opt) {
-+ int err = fq_codel_change(sch, opt);
-+ if (err)
-+ return err;
-+ }
-+
-+ if (!q->flows) {
-+ q->flows = fq_codel_zalloc(q->flows_cnt *
-+ sizeof(struct fq_codel_flow));
-+ if (!q->flows)
-+ return -ENOMEM;
-+ q->backlogs = fq_codel_zalloc(q->flows_cnt * sizeof(u32));
-+ if (!q->backlogs) {
-+ fq_codel_free(q->flows);
-+ return -ENOMEM;
-+ }
-+ for (i = 0; i < q->flows_cnt; i++) {
-+ struct fq_codel_flow *flow = q->flows + i;
-+
-+ INIT_LIST_HEAD(&flow->flowchain);
-+ }
-+ }
-+ if (sch->limit >= 1)
-+ sch->flags |= TCQ_F_CAN_BYPASS;
-+ else
-+ sch->flags &= ~TCQ_F_CAN_BYPASS;
-+ return 0;
-+}
-+
-+static int fq_codel_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+ struct nlattr *opts;
-+
-+ opts = nla_nest_start(skb, TCA_OPTIONS);
-+ if (opts == NULL)
-+ goto nla_put_failure;
-+
-+ if (nla_put_u32(skb, TCA_FQ_CODEL_TARGET,
-+ codel_time_to_us(q->cparams.target)) ||
-+ nla_put_u32(skb, TCA_FQ_CODEL_LIMIT,
-+ sch->limit) ||
-+ nla_put_u32(skb, TCA_FQ_CODEL_INTERVAL,
-+ codel_time_to_us(q->cparams.interval)) ||
-+ nla_put_u32(skb, TCA_FQ_CODEL_ECN,
-+ q->cparams.ecn) ||
-+ nla_put_u32(skb, TCA_FQ_CODEL_QUANTUM,
-+ q->quantum) ||
-+ nla_put_u32(skb, TCA_FQ_CODEL_FLOWS,
-+ q->flows_cnt))
-+ goto nla_put_failure;
-+
-+ nla_nest_end(skb, opts);
-+ return skb->len;
-+
-+nla_put_failure:
-+ return -1;
-+}
-+
-+static int fq_codel_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+ struct tc_fq_codel_xstats st = {
-+ .type = TCA_FQ_CODEL_XSTATS_QDISC,
-+ .qdisc_stats.maxpacket = q->cstats.maxpacket,
-+ .qdisc_stats.drop_overlimit = q->drop_overlimit,
-+ .qdisc_stats.ecn_mark = q->cstats.ecn_mark,
-+ .qdisc_stats.new_flow_count = q->new_flow_count,
-+ };
-+ struct list_head *pos;
-+
-+ list_for_each(pos, &q->new_flows)
-+ st.qdisc_stats.new_flows_len++;
-+
-+ list_for_each(pos, &q->old_flows)
-+ st.qdisc_stats.old_flows_len++;
-+
-+ return gnet_stats_copy_app(d, &st, sizeof(st));
-+}
-+
-+static struct Qdisc *fq_codel_leaf(struct Qdisc *sch, unsigned long arg)
-+{
-+ return NULL;
-+}
-+
-+static unsigned long fq_codel_get(struct Qdisc *sch, u32 classid)
-+{
-+ return 0;
-+}
-+
-+static unsigned long fq_codel_bind(struct Qdisc *sch, unsigned long parent,
-+ u32 classid)
-+{
-+ /* we cannot bypass queue discipline anymore */
-+ sch->flags &= ~TCQ_F_CAN_BYPASS;
-+ return 0;
-+}
-+
-+static void fq_codel_put(struct Qdisc *q, unsigned long cl)
-+{
-+}
-+
-+static struct tcf_proto **fq_codel_find_tcf(struct Qdisc *sch, unsigned long cl)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+
-+ if (cl)
-+ return NULL;
-+ return &q->filter_list;
-+}
-+
-+static int fq_codel_dump_class(struct Qdisc *sch, unsigned long cl,
-+ struct sk_buff *skb, struct tcmsg *tcm)
-+{
-+ tcm->tcm_handle |= TC_H_MIN(cl);
-+ return 0;
-+}
-+
-+static int fq_codel_dump_class_stats(struct Qdisc *sch, unsigned long cl,
-+ struct gnet_dump *d)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+ u32 idx = cl - 1;
-+ struct gnet_stats_queue qs = { 0 };
-+ struct tc_fq_codel_xstats xstats;
-+
-+ if (idx < q->flows_cnt) {
-+ const struct fq_codel_flow *flow = &q->flows[idx];
-+ const struct sk_buff *skb = flow->head;
-+
-+ memset(&xstats, 0, sizeof(xstats));
-+ xstats.type = TCA_FQ_CODEL_XSTATS_CLASS;
-+ xstats.class_stats.deficit = flow->deficit;
-+ xstats.class_stats.ldelay =
-+ codel_time_to_us(flow->cvars.ldelay);
-+ xstats.class_stats.count = flow->cvars.count;
-+ xstats.class_stats.lastcount = flow->cvars.lastcount;
-+ xstats.class_stats.dropping = flow->cvars.dropping;
-+ if (flow->cvars.dropping) {
-+ codel_tdiff_t delta = flow->cvars.drop_next -
-+ codel_get_time();
-+
-+ xstats.class_stats.drop_next = (delta >= 0) ?
-+ codel_time_to_us(delta) :
-+ -codel_time_to_us(-delta);
-+ }
-+ while (skb) {
-+ qs.qlen++;
-+ skb = skb->next;
-+ }
-+ qs.backlog = q->backlogs[idx];
-+ qs.drops = flow->dropped;
-+ }
-+ if (gnet_stats_copy_queue(d, &qs) < 0)
-+ return -1;
-+ if (idx < q->flows_cnt)
-+ return gnet_stats_copy_app(d, &xstats, sizeof(xstats));
-+ return 0;
-+}
-+
-+static void fq_codel_walk(struct Qdisc *sch, struct qdisc_walker *arg)
-+{
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
-+ unsigned int i;
-+
-+ if (arg->stop)
-+ return;
-+
-+ for (i = 0; i < q->flows_cnt; i++) {
-+ if (list_empty(&q->flows[i].flowchain) ||
-+ arg->count < arg->skip) {
-+ arg->count++;
-+ continue;
-+ }
-+ if (arg->fn(sch, i + 1, arg) < 0) {
-+ arg->stop = 1;
-+ break;
-+ }
-+ arg->count++;
-+ }
-+}
-+
-+static const struct Qdisc_class_ops fq_codel_class_ops = {
-+ .leaf = fq_codel_leaf,
-+ .get = fq_codel_get,
-+ .put = fq_codel_put,
-+ .tcf_chain = fq_codel_find_tcf,
-+ .bind_tcf = fq_codel_bind,
-+ .unbind_tcf = fq_codel_put,
-+ .dump = fq_codel_dump_class,
-+ .dump_stats = fq_codel_dump_class_stats,
-+ .walk = fq_codel_walk,
-+};
-+
-+static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
-+ .cl_ops = &fq_codel_class_ops,
-+ .id = "fq_codel",
-+ .priv_size = sizeof(struct fq_codel_sched_data),
-+ .enqueue = fq_codel_enqueue,
-+ .dequeue = fq_codel_dequeue,
-+ .peek = qdisc_peek_dequeued,
-+ .drop = fq_codel_drop,
-+ .init = fq_codel_init,
-+ .reset = fq_codel_reset,
-+ .destroy = fq_codel_destroy,
-+ .change = fq_codel_change,
-+ .dump = fq_codel_dump,
-+ .dump_stats = fq_codel_dump_stats,
-+ .owner = THIS_MODULE,
-+};
-+
-+static int __init fq_codel_module_init(void)
-+{
-+ return register_qdisc(&fq_codel_qdisc_ops);
-+}
-+
-+static void __exit fq_codel_module_exit(void)
-+{
-+ unregister_qdisc(&fq_codel_qdisc_ops);
-+}
-+
-+module_init(fq_codel_module_init)
-+module_exit(fq_codel_module_exit)
-+MODULE_AUTHOR("Eric Dumazet");
-+MODULE_LICENSE("GPL");
---
-1.7.10
-
+++ /dev/null
-From: Geert Uytterhoeven <geert@linux-m68k.org>
-Date: Mon, 14 May 2012 09:47:05 +0000
-Subject: [PATCH 4/7] net/codel: Add missing #include <linux/prefetch.h>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit ce5b4b977127ee20c3f9c3fd3637cd3796f649f5 upstream.
-
-m68k allmodconfig:
-
-net/sched/sch_codel.c: In function ‘dequeue’:
-net/sched/sch_codel.c:70: error: implicit declaration of function ‘prefetch’
-make[1]: *** [net/sched/sch_codel.o] Error 1
-
-Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-Acked-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/sched/sch_codel.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
-index b4a1a81..213ef60 100644
---- a/net/sched/sch_codel.c
-+++ b/net/sched/sch_codel.c
-@@ -46,6 +46,7 @@
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/skbuff.h>
-+#include <linux/prefetch.h>
- #include <net/pkt_sched.h>
- #include <net/codel.h>
-
---
-1.7.10
-
+++ /dev/null
-From: Sasha Levin <levinsasha928@gmail.com>
-Date: Mon, 14 May 2012 11:57:06 +0000
-Subject: [PATCH 5/7] net: codel: fix build errors
-
-commit 669d67bf777def468970f2dcba1537edf3b2d329 upstream.
-
-Fix the following build error:
-
-net/sched/sch_fq_codel.c: In function 'fq_codel_dump_stats':
-net/sched/sch_fq_codel.c:464:3: error: unknown field 'qdisc_stats' specified in initializer
-net/sched/sch_fq_codel.c:464:3: warning: missing braces around initializer
-net/sched/sch_fq_codel.c:464:3: warning: (near initialization for 'st.<anonymous>')
-net/sched/sch_fq_codel.c:465:3: error: unknown field 'qdisc_stats' specified in initializer
-net/sched/sch_fq_codel.c:465:3: warning: excess elements in struct initializer
-net/sched/sch_fq_codel.c:465:3: warning: (near initialization for 'st')
-net/sched/sch_fq_codel.c:466:3: error: unknown field 'qdisc_stats' specified in initializer
-net/sched/sch_fq_codel.c:466:3: warning: excess elements in struct initializer
-net/sched/sch_fq_codel.c:466:3: warning: (near initialization for 'st')
-net/sched/sch_fq_codel.c:467:3: error: unknown field 'qdisc_stats' specified in initializer
-net/sched/sch_fq_codel.c:467:3: warning: excess elements in struct initializer
-net/sched/sch_fq_codel.c:467:3: warning: (near initialization for 'st')
-make[1]: *** [net/sched/sch_fq_codel.o] Error 1
-
-Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/sched/sch_fq_codel.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
-index a7b3754..337ff20 100644
---- a/net/sched/sch_fq_codel.c
-+++ b/net/sched/sch_fq_codel.c
-@@ -461,13 +461,14 @@ static int fq_codel_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
- struct fq_codel_sched_data *q = qdisc_priv(sch);
- struct tc_fq_codel_xstats st = {
- .type = TCA_FQ_CODEL_XSTATS_QDISC,
-- .qdisc_stats.maxpacket = q->cstats.maxpacket,
-- .qdisc_stats.drop_overlimit = q->drop_overlimit,
-- .qdisc_stats.ecn_mark = q->cstats.ecn_mark,
-- .qdisc_stats.new_flow_count = q->new_flow_count,
- };
- struct list_head *pos;
-
-+ st.qdisc_stats.maxpacket = q->cstats.maxpacket;
-+ st.qdisc_stats.drop_overlimit = q->drop_overlimit;
-+ st.qdisc_stats.ecn_mark = q->cstats.ecn_mark;
-+ st.qdisc_stats.new_flow_count = q->new_flow_count;
-+
- list_for_each(pos, &q->new_flows)
- st.qdisc_stats.new_flows_len++;
-
---
-1.7.10
-
+++ /dev/null
-From: Eric Dumazet <eric.dumazet@gmail.com>
-Date: Sat, 12 May 2012 21:23:23 +0000
-Subject: [PATCH 6/7] codel: use u16 field instead of 31bits for rec_inv_sqrt
-
-commit 6ff272c9ad65eda219cd975b9da2dbc31cc812ee upstream.
-
-David pointed out gcc might generate poor code with 31bit fields.
-
-Using u16 is more than enough and permits a better code output.
-
-Also make the code intent more readable using constants, fixed point arithmetic
-not being trivial for everybody.
-
-Suggested-by: David Miller <davem@davemloft.net>
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/net/codel.h | 25 +++++++++++++++----------
- 1 file changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/include/net/codel.h b/include/net/codel.h
-index bd8747c..7546517 100644
---- a/include/net/codel.h
-+++ b/include/net/codel.h
-@@ -133,13 +133,17 @@ struct codel_params {
- struct codel_vars {
- u32 count;
- u32 lastcount;
-- bool dropping:1;
-- u32 rec_inv_sqrt:31;
-+ bool dropping;
-+ u16 rec_inv_sqrt;
- codel_time_t first_above_time;
- codel_time_t drop_next;
- codel_time_t ldelay;
- };
-
-+#define REC_INV_SQRT_BITS (8 * sizeof(u16)) /* or sizeof_in_bits(rec_inv_sqrt) */
-+/* needed shift to get a Q0.32 number from rec_inv_sqrt */
-+#define REC_INV_SQRT_SHIFT (32 - REC_INV_SQRT_BITS)
-+
- /**
- * struct codel_stats - contains codel shared variables and stats
- * @maxpacket: largest packet we've seen so far
-@@ -173,17 +177,18 @@ static void codel_stats_init(struct codel_stats *stats)
- * http://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Iterative_methods_for_reciprocal_square_roots
- * new_invsqrt = (invsqrt / 2) * (3 - count * invsqrt^2)
- *
-- * Here, invsqrt is a fixed point number (< 1.0), 31bit mantissa)
-+ * Here, invsqrt is a fixed point number (< 1.0), 32bit mantissa, aka Q0.32
- */
- static void codel_Newton_step(struct codel_vars *vars)
- {
-- u32 invsqrt = vars->rec_inv_sqrt;
-- u32 invsqrt2 = ((u64)invsqrt * invsqrt) >> 31;
-- u64 val = (3LL << 31) - ((u64)vars->count * invsqrt2);
-+ u32 invsqrt = ((u32)vars->rec_inv_sqrt) << REC_INV_SQRT_SHIFT;
-+ u32 invsqrt2 = ((u64)invsqrt * invsqrt) >> 32;
-+ u64 val = (3LL << 32) - ((u64)vars->count * invsqrt2);
-
-- val = (val * invsqrt) >> 32;
-+ val >>= 2; /* avoid overflow in following multiply */
-+ val = (val * invsqrt) >> (32 - 2 + 1);
-
-- vars->rec_inv_sqrt = val;
-+ vars->rec_inv_sqrt = val >> REC_INV_SQRT_SHIFT;
- }
-
- /*
-@@ -195,7 +200,7 @@ static codel_time_t codel_control_law(codel_time_t t,
- codel_time_t interval,
- u32 rec_inv_sqrt)
- {
-- return t + reciprocal_divide(interval, rec_inv_sqrt << 1);
-+ return t + reciprocal_divide(interval, rec_inv_sqrt << REC_INV_SQRT_SHIFT);
- }
-
-
-@@ -326,7 +331,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
- codel_Newton_step(vars);
- } else {
- vars->count = 1;
-- vars->rec_inv_sqrt = 0x7fffffff;
-+ vars->rec_inv_sqrt = ~0U >> REC_INV_SQRT_SHIFT;
- }
- vars->lastcount = vars->count;
- vars->drop_next = codel_control_law(now, params->interval,
---
-1.7.10
-
+++ /dev/null
-From: Eric Dumazet <edumazet@google.com>
-Date: Wed, 16 May 2012 04:39:09 +0000
-Subject: [PATCH 7/7] fq_codel: should use qdisc backlog as threshold
-
-commit 865ec5523dadbedefbc5710a68969f686a28d928 upstream.
-
-codel_should_drop() logic allows a packet being not dropped if queue
-size is under max packet size.
-
-In fq_codel, we have two possible backlogs : The qdisc global one, and
-the flow local one.
-
-The meaningful one for codel_should_drop() should be the global backlog,
-not the per flow one, so that thin flows can have a non zero drop/mark
-probability.
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Cc: Dave Taht <dave.taht@bufferbloat.net>
-Cc: Kathleen Nichols <nichols@pollere.com>
-Cc: Van Jacobson <van@pollere.net>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/net/codel.h | 15 +++++++--------
- net/sched/sch_codel.c | 4 ++--
- net/sched/sch_fq_codel.c | 5 +++--
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/include/net/codel.h b/include/net/codel.h
-index 7546517..550debf 100644
---- a/include/net/codel.h
-+++ b/include/net/codel.h
-@@ -205,7 +205,7 @@ static codel_time_t codel_control_law(codel_time_t t,
-
-
- static bool codel_should_drop(const struct sk_buff *skb,
-- unsigned int *backlog,
-+ struct Qdisc *sch,
- struct codel_vars *vars,
- struct codel_params *params,
- struct codel_stats *stats,
-@@ -219,13 +219,13 @@ static bool codel_should_drop(const struct sk_buff *skb,
- }
-
- vars->ldelay = now - codel_get_enqueue_time(skb);
-- *backlog -= qdisc_pkt_len(skb);
-+ sch->qstats.backlog -= qdisc_pkt_len(skb);
-
- if (unlikely(qdisc_pkt_len(skb) > stats->maxpacket))
- stats->maxpacket = qdisc_pkt_len(skb);
-
- if (codel_time_before(vars->ldelay, params->target) ||
-- *backlog <= stats->maxpacket) {
-+ sch->qstats.backlog <= stats->maxpacket) {
- /* went below - stay below for at least interval */
- vars->first_above_time = 0;
- return false;
-@@ -249,8 +249,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
- struct codel_params *params,
- struct codel_vars *vars,
- struct codel_stats *stats,
-- codel_skb_dequeue_t dequeue_func,
-- u32 *backlog)
-+ codel_skb_dequeue_t dequeue_func)
- {
- struct sk_buff *skb = dequeue_func(vars, sch);
- codel_time_t now;
-@@ -261,7 +260,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
- return skb;
- }
- now = codel_get_time();
-- drop = codel_should_drop(skb, backlog, vars, params, stats, now);
-+ drop = codel_should_drop(skb, sch, vars, params, stats, now);
- if (vars->dropping) {
- if (!drop) {
- /* sojourn time below target - leave dropping state */
-@@ -292,7 +291,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
- qdisc_drop(skb, sch);
- stats->drop_count++;
- skb = dequeue_func(vars, sch);
-- if (!codel_should_drop(skb, backlog,
-+ if (!codel_should_drop(skb, sch,
- vars, params, stats, now)) {
- /* leave dropping state */
- vars->dropping = false;
-@@ -313,7 +312,7 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
- stats->drop_count++;
-
- skb = dequeue_func(vars, sch);
-- drop = codel_should_drop(skb, backlog, vars, params,
-+ drop = codel_should_drop(skb, sch, vars, params,
- stats, now);
- }
- vars->dropping = true;
-diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
-index 213ef60..2f9ab17 100644
---- a/net/sched/sch_codel.c
-+++ b/net/sched/sch_codel.c
-@@ -77,8 +77,8 @@ static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch)
- struct codel_sched_data *q = qdisc_priv(sch);
- struct sk_buff *skb;
-
-- skb = codel_dequeue(sch, &q->params, &q->vars, &q->stats,
-- dequeue, &sch->qstats.backlog);
-+ skb = codel_dequeue(sch, &q->params, &q->vars, &q->stats, dequeue);
-+
- /* We cant call qdisc_tree_decrease_qlen() if our qlen is 0,
- * or HTB crashes. Defer it for next round.
- */
-diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
-index 337ff20..9fc1c62 100644
---- a/net/sched/sch_fq_codel.c
-+++ b/net/sched/sch_fq_codel.c
-@@ -217,13 +217,14 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch)
- */
- static struct sk_buff *dequeue(struct codel_vars *vars, struct Qdisc *sch)
- {
-+ struct fq_codel_sched_data *q = qdisc_priv(sch);
- struct fq_codel_flow *flow;
- struct sk_buff *skb = NULL;
-
- flow = container_of(vars, struct fq_codel_flow, cvars);
- if (flow->head) {
- skb = dequeue_head(flow);
-- sch->qstats.backlog -= qdisc_pkt_len(skb);
-+ q->backlogs[flow - q->flows] -= qdisc_pkt_len(skb);
- sch->q.qlen--;
- }
- return skb;
-@@ -256,7 +257,7 @@ begin:
- prev_ecn_mark = q->cstats.ecn_mark;
-
- skb = codel_dequeue(sch, &q->cparams, &flow->cvars, &q->cstats,
-- dequeue, &q->backlogs[flow - q->flows]);
-+ dequeue);
-
- flow->dropped += q->cstats.drop_count - prev_drop_count;
- flow->dropped += q->cstats.ecn_mark - prev_ecn_mark;
---
-1.7.10
-
+++ /dev/null
-From: Eric Dumazet <eric.dumazet@gmail.com>
-Date: Mon, 28 Nov 2011 20:30:35 +0000
-Subject: [PATCH 2/3] flow_dissector: use a 64bit load/store
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 4d77d2b567ec66a443792d99e96ac760991d80d0 upstream.
-
-Le lundi 28 novembre 2011 à 19:06 -0500, David Miller a écrit :
-> From: Dimitris Michailidis <dm@chelsio.com>
-> Date: Mon, 28 Nov 2011 08:25:39 -0800
->
-> >> +bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys
-> >> *flow)
-> >> +{
-> >> + int poff, nhoff = skb_network_offset(skb);
-> >> + u8 ip_proto;
-> >> + u16 proto = skb->protocol;
-> >
-> > __be16 instead of u16 for proto?
->
-> I'll take care of this when I apply these patches.
-
-( CC trimmed )
-
-Thanks David !
-
-Here is a small patch to use one 64bit load/store on x86_64 instead of
-two 32bit load/stores.
-
-[PATCH net-next] flow_dissector: use a 64bit load/store
-
-gcc compiler is smart enough to use a single load/store if we
-memcpy(dptr, sptr, 8) on x86_64, regardless of
-CONFIG_CC_OPTIMIZE_FOR_SIZE
-
-In IP header, daddr immediately follows saddr, this wont change in the
-future. We only need to make sure our flow_keys (src,dst) fields wont
-break the rule.
-
-Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h
-index e4cb285..80461c1 100644
---- a/include/net/flow_keys.h
-+++ b/include/net/flow_keys.h
-@@ -2,6 +2,7 @@
- #define _NET_FLOW_KEYS_H
-
- struct flow_keys {
-+ /* (src,dst) must be grouped, in the same way than in IP header */
- __be32 src;
- __be32 dst;
- union {
-diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
-index f0516d9..0985b9b 100644
---- a/net/core/flow_dissector.c
-+++ b/net/core/flow_dissector.c
-@@ -8,6 +8,16 @@
- #include <linux/ppp_defs.h>
- #include <net/flow_keys.h>
-
-+/* copy saddr & daddr, possibly using 64bit load/store
-+ * Equivalent to : flow->src = iph->saddr;
-+ * flow->dst = iph->daddr;
-+ */
-+static void iph_to_flow_copy_addrs(struct flow_keys *flow, const struct iphdr *iph)
-+{
-+ BUILD_BUG_ON(offsetof(typeof(*flow), dst) !=
-+ offsetof(typeof(*flow), src) + sizeof(flow->src));
-+ memcpy(&flow->src, &iph->saddr, sizeof(flow->src) + sizeof(flow->dst));
-+}
-
- bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow)
- {
-@@ -31,8 +41,7 @@ ip:
- ip_proto = 0;
- else
- ip_proto = iph->protocol;
-- flow->src = iph->saddr;
-- flow->dst = iph->daddr;
-+ iph_to_flow_copy_addrs(flow, iph);
- nhoff += iph->ihl * 4;
- break;
- }
---
-1.7.10
-
+++ /dev/null
-From: Jesper Dangaard Brouer <hawk@comx.dk>
-Date: Tue, 24 Jan 2012 16:03:33 -0500
-Subject: [PATCH 3/3] net: flow_dissector.c missing include linux/export.h
-
-commit c452ed70771cea3af73d21a5914989137fbd28b8 upstream.
-
-The file net/core/flow_dissector.c seems to be missing
-including linux/export.h.
-
-Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
-index 0985b9b..a225089 100644
---- a/net/core/flow_dissector.c
-+++ b/net/core/flow_dissector.c
-@@ -1,4 +1,5 @@
- #include <linux/skbuff.h>
-+#include <linux/export.h>
- #include <linux/ip.h>
- #include <linux/ipv6.h>
- #include <linux/if_vlan.h>
---
-1.7.10
-
-#!/bin/bash
+#!/tools/bin/bash
+
+dirs=""
+excludes="/dev /proc /sys /run"
+
+while [ $# -gt 0 ]; do
+ case "${1}" in
+ --exclude=*)
+ excludes="${excludes} ${1#*=}"
+ ;;
+ *)
+ dirs="${dirs} ${1}"
+ ;;
+ esac
+ shift
+done
function _strip() {
local file=${1}
-
local cmd="${STRIP-strip}"
+ local exclude l
+ for exclude in ${excludes}; do
+ l=${#exclude}
+ if [ "${file:0:${l}}" = "${exclude}" ]; then
+ return 0
+ fi
+ done
+
case "$(file -bi ${file})" in
application/x-sharedlib*|application/x-archive*)
cmd="${cmd} --strip-debug --remove-section=.comment --remove-section=.note"
${cmd} ${file}
}
-for dir in $@; do
+for dir in ${dirs}; do
# Strip shared objects.
find ${dir} -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) \
| file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' |
CROSSTARGET="${CROSSTARGET}" \
MACHINE="$MACHINE" \
MACHINE_TYPE="$MACHINE_TYPE" \
- /bin/bash -x -c "cd /usr/src/lfs && \
- make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
+ LD_LIBRARY_PATH=/tools/lib \
+ /tools/bin/bash -x -c "cd /usr/src/lfs && \
+ /tools/bin/make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
local COMPILE_SUCCESS=$?
local PKG_TIME_END=`date +%s`