From a3b414d38a128a78b086a9c1249e9a05063b4f44 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 22 Mar 2009 16:02:34 +0100 Subject: [PATCH] Update Kernel to 2.6.27.20 Update alsa to 1.0.19 Update cdrtools to 2.01.01... Update mISDN 2 to current socket branch --- config/kernel/kernel.config.i586 | 701 +++++----- config/rootfiles/common/cdrtools | 201 +++ config/rootfiles/common/klibc | 127 ++ config/rootfiles/common/linux | 189 +++ config/rootfiles/common/linux-firmware | 69 + config/rootfiles/common/mISDN | 50 +- .../core/28/filelists/linux-firmware | 1 + config/rootfiles/core/28/update.sh | 2 +- config/rootfiles/packages/alsa | 47 + .../packages/{asterisk => asterisk-disabled} | 0 doc/packages-list.txt | 21 +- lfs/alsa | 14 +- lfs/cdrtools | 14 +- lfs/initrd | 7 +- lfs/iptables | 2 +- lfs/linux | 35 +- lfs/mISDN | 14 +- make.sh | 2 +- src/patches/iptables-1.4.2-imq.patch | 99 ++ src/patches/linux-2.6.27-imq.patch | 1150 +++++++++++++++++ .../linux-2.6.27.19-ipp2p-0.8.2-pomng.patch | 980 ++++++++++++++ 21 files changed, 3346 insertions(+), 379 deletions(-) create mode 100644 config/rootfiles/common/linux-firmware create mode 120000 config/rootfiles/core/28/filelists/linux-firmware rename config/rootfiles/packages/{asterisk => asterisk-disabled} (100%) create mode 100644 src/patches/iptables-1.4.2-imq.patch create mode 100644 src/patches/linux-2.6.27-imq.patch create mode 100644 src/patches/linux-2.6.27.19-ipp2p-0.8.2-pomng.patch diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index 9a4e558fd..8f362782e 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.25.19-ipfire -# Thu Nov 6 10:24:53 2008 +# Linux kernel version: 2.6.27.20-ipfire +# Sun Mar 22 12:17:03 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -17,7 +17,6 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_FAST_CMPXCHG_LOCAL=y CONFIG_MMU=y CONFIG_ZONE_DMA=y @@ -27,7 +26,6 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y # CONFIG_GENERIC_GPIO is not set CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_DMI=y # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set @@ -36,13 +34,17 @@ CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_CALIBRATE_DELAY=y # CONFIG_GENERIC_TIME_VSYSCALL is not set CONFIG_ARCH_HAS_CPU_RELAX=y -# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_ZONE_DMA32 is not set CONFIG_ARCH_POPULATES_NODE_MAP=y # CONFIG_AUDIT_ARCH is not set CONFIG_ARCH_SUPPORTS_AOUT=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y @@ -74,6 +76,7 @@ CONFIG_AUDIT_TREE=y # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=15 # CONFIG_CGROUPS is not set +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y @@ -96,6 +99,7 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y CONFIG_COMPAT_BRK=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y @@ -113,14 +117,22 @@ CONFIG_SLAB=y # CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y +# CONFIG_HAVE_ARCH_TRACEHOOK is not set +# CONFIG_HAVE_DMA_ATTRS is not set +CONFIG_USE_GENERIC_SMP_HELPERS=y +# CONFIG_HAVE_CLK is not set CONFIG_PROC_PAGE_MONITOR=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set @@ -132,6 +144,7 @@ CONFIG_LBD=y # CONFIG_BLK_DEV_IO_TRACE is not set CONFIG_LSF=y # CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set # # IO Schedulers @@ -156,23 +169,24 @@ CONFIG_CLASSIC_RCU=y # CONFIG_HIGH_RES_TIMERS is not set CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y +CONFIG_X86_FIND_SMP_CONFIG=y +CONFIG_X86_MPPARSE=y CONFIG_X86_PC=y # CONFIG_X86_ELAN is not set # CONFIG_X86_VOYAGER is not set -# CONFIG_X86_NUMAQ is not set -# CONFIG_X86_SUMMIT is not set -# CONFIG_X86_BIGSMP is not set -# CONFIG_X86_VISWS is not set # CONFIG_X86_GENERICARCH is not set -# CONFIG_X86_ES7000 is not set -# CONFIG_X86_RDC321X is not set # CONFIG_X86_VSMP is not set +# CONFIG_X86_RDC321X is not set CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y -CONFIG_XEN=y +CONFIG_XEN_SAVE_RESTORE=y CONFIG_VMI=y +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y CONFIG_LGUEST_GUEST=y CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_MEMTEST is not set # CONFIG_M386 is not set # CONFIG_M486 is not set # CONFIG_M586 is not set @@ -200,6 +214,7 @@ CONFIG_M586TSC=y # CONFIG_MCORE2 is not set # CONFIG_GENERIC_CPU is not set CONFIG_X86_GENERIC=y +CONFIG_X86_CPU=y CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=7 CONFIG_X86_XADD=y @@ -215,6 +230,7 @@ CONFIG_X86_TSC=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y @@ -251,14 +267,19 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPARSEMEM_STATIC=y # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y # CONFIG_HIGHPTE is not set +CONFIG_X86_RESERVE_LOW_64K=y CONFIG_MATH_EMULATION=y CONFIG_MTRR=y +# CONFIG_MTRR_SANITIZER is not set +# CONFIG_X86_PAT is not set # CONFIG_EFI is not set CONFIG_IRQBALANCE=y CONFIG_SECCOMP=y @@ -281,7 +302,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP_SMP=y CONFIG_PM_SLEEP=y @@ -305,18 +325,19 @@ CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m CONFIG_ACPI_WMI=m -# CONFIG_ACPI_ASUS is not set -# CONFIG_ACPI_TOSHIBA is not set +CONFIG_ACPI_ASUS=m +CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y +CONFIG_ACPI_PCI_SLOT=m CONFIG_ACPI_POWER=y CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m -# CONFIG_ACPI_SBS is not set +CONFIG_ACPI_SBS=m CONFIG_X86_APM_BOOT=y CONFIG_APM=m CONFIG_APM_IGNORE_USER_SUSPEND=y @@ -335,6 +356,7 @@ CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set @@ -380,6 +402,7 @@ CONFIG_PCI=y # CONFIG_PCI_GOBIOS is not set # CONFIG_PCI_GOMMCONFIG is not set # CONFIG_PCI_GODIRECT is not set +# CONFIG_PCI_GOOLPC is not set CONFIG_PCI_GOANY=y CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y @@ -387,6 +410,7 @@ CONFIG_PCI_MMCONFIG=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_PCIEAER=y +# CONFIG_PCIEASPM is not set CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y @@ -403,6 +427,7 @@ CONFIG_MCA_LEGACY=y # CONFIG_MCA_PROC_FS is not set CONFIG_SCx200=m CONFIG_SCx200HR_TIMER=m +# CONFIG_OLPC is not set CONFIG_K8_NB=y CONFIG_PCCARD=m # CONFIG_PCMCIA_DEBUG is not set @@ -434,10 +459,6 @@ CONFIG_PCCARD_NONSTATIC=m CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set - -# -# Networking -# CONFIG_NET=y # @@ -451,6 +472,7 @@ CONFIG_XFRM_USER=m # CONFIG_XFRM_SUB_POLICY is not set CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y @@ -476,7 +498,6 @@ CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m -CONFIG_IPSEC_NAT_TRAVERSAL=y CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y @@ -506,8 +527,6 @@ CONFIG_DEFAULT_TCP_CONG="reno" # CONFIG_TCP_MD5SIG is not set # CONFIG_IP_VS is not set # CONFIG_IPV6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set # CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set @@ -521,9 +540,10 @@ CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m -CONFIG_NF_CT_ACCT=y +# CONFIG_NF_CT_ACCT is not set CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m CONFIG_NF_CT_PROTO_UDPLITE=m @@ -541,6 +561,7 @@ CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_IMQ=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m @@ -550,7 +571,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m @@ -573,8 +594,6 @@ CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_LAYER7=m -# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m @@ -595,7 +614,6 @@ CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_IMQ=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m @@ -605,7 +623,10 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_TFTP=m @@ -646,6 +667,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set @@ -655,8 +677,11 @@ CONFIG_ATM_CLIP_NO_ICMP=y # CONFIG_ATM_LANE is not set CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_STP=m +CONFIG_GARP=m CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m # CONFIG_LLC2 is not set @@ -676,7 +701,6 @@ CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RR=m CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m @@ -787,8 +811,7 @@ CONFIG_BT_HIDP=m # # Bluetooth device drivers # -CONFIG_BT_HCIUSB=m -CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y @@ -813,35 +836,23 @@ CONFIG_FIB_RULES=y CONFIG_CFG80211=m CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_MAC80211=m # # Rate control algorithm selection # +CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set -# CONFIG_MAC80211_RC_DEFAULT_NONE is not set - -# -# Selecting 'y' for an algorithm will -# - -# -# build the algorithm into mac80211. -# CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_RC_PID=y -CONFIG_MAC80211_RC_SIMPLE=m -# CONFIG_MAC80211_LEDS is not set -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -# CONFIG_MAC80211_DEBUG is not set +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m -CONFIG_IEEE80211_SOFTMAC=m -# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=m CONFIG_RFKILL_LEDS=y @@ -857,7 +868,9 @@ CONFIG_RFKILL_LEDS=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_FW_LOADER=m +CONFIG_FW_LOADER=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" # CONFIG_SYS_HYPERVISOR is not set CONFIG_CONNECTOR=m CONFIG_MTD=m @@ -865,6 +878,7 @@ CONFIG_MTD=m CONFIG_MTD_CONCAT=m CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_AR7_PARTS=m # # User Modules And Translation Layers @@ -978,8 +992,8 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_BLK_DEV_XIP is not set # CONFIG_CDROM_PKTCDVD is not set CONFIG_ATA_OVER_ETH=m -CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y # CONFIG_IBM_ASM is not set # CONFIG_PHANTOM is not set @@ -990,8 +1004,11 @@ CONFIG_TIFM_7XX1=m CONFIG_ACER_WMI=m CONFIG_ASUS_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m +CONFIG_FUJITSU_LAPTOP_DEBUG=y CONFIG_TC1100_WMI=m +CONFIG_HP_WMI=m CONFIG_MSI_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m CONFIG_SONY_LAPTOP=m # CONFIG_SONYPI_COMPAT is not set CONFIG_THINKPAD_ACPI=m @@ -1000,7 +1017,9 @@ CONFIG_THINKPAD_ACPI_BAY=y CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m CONFIG_ENCLOSURE_SERVICES=m +CONFIG_HP_ILO=m CONFIG_HAVE_IDE=y CONFIG_IDE=y CONFIG_BLK_DEV_IDE=m @@ -1008,8 +1027,9 @@ CONFIG_BLK_DEV_IDE=m # # Please see Documentation/ide/ide.txt for help/info on IDE drives # +CONFIG_IDE_TIMINGS=y +CONFIG_IDE_ATAPI=y # CONFIG_BLK_DEV_IDE_SATA is not set -# CONFIG_BLK_DEV_HD_IDE is not set CONFIG_BLK_DEV_IDEDISK=m # CONFIG_IDEDISK_MULTI_MODE is not set CONFIG_BLK_DEV_IDECS=m @@ -1044,17 +1064,13 @@ CONFIG_BLK_DEV_RZ1000=m CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_AEC62XX=m CONFIG_BLK_DEV_ALI15X3=m -# CONFIG_WDC_ALI15X3 is not set CONFIG_BLK_DEV_AMD74XX=m CONFIG_BLK_DEV_ATIIXP=m CONFIG_BLK_DEV_CMD64X=m CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CY82C693=m CONFIG_BLK_DEV_CS5520=m CONFIG_BLK_DEV_CS5530=m CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_HPT34X=m -# CONFIG_HPT34X_AUTODMA is not set CONFIG_BLK_DEV_HPT366=m CONFIG_BLK_DEV_JMICRON=m CONFIG_BLK_DEV_SC1200=m @@ -1086,8 +1102,6 @@ CONFIG_BLK_DEV_HT6560B=m CONFIG_BLK_DEV_QD65XX=m CONFIG_BLK_DEV_UMC8672=m CONFIG_BLK_DEV_IDEDMA=y -CONFIG_IDE_ARCH_OBSOLETE_INIT=y -# CONFIG_BLK_DEV_HD is not set # # SCSI device support @@ -1171,7 +1185,7 @@ CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m -# CONFIG_SCSI_OMIT_FLASHPOINT is not set +CONFIG_SCSI_FLASHPOINT=y CONFIG_SCSI_DMX3191D=m CONFIG_SCSI_DTC3280=m CONFIG_SCSI_EATA=m @@ -1235,10 +1249,18 @@ CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_NINJA_SCSI=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y CONFIG_SATA_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y CONFIG_SATA_SVW=m CONFIG_ATA_PIIX=m CONFIG_SATA_MV=m @@ -1248,7 +1270,6 @@ CONFIG_SATA_QSTOR=m CONFIG_SATA_PROMISE=m CONFIG_SATA_SX4=m CONFIG_SATA_SIL=m -CONFIG_SATA_SIL24=m CONFIG_SATA_SIS=m CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m @@ -1301,6 +1322,7 @@ CONFIG_PATA_SIS=m CONFIG_PATA_VIA=m CONFIG_PATA_WINBOND=m CONFIG_PATA_WINBOND_VLB=m +CONFIG_PATA_SCH=m CONFIG_MD=y CONFIG_BLK_DEV_MD=m CONFIG_MD_LINEAR=m @@ -1318,9 +1340,6 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_HP=m CONFIG_DM_DELAY=m CONFIG_DM_UEVENT=y CONFIG_FUSION=y @@ -1334,36 +1353,28 @@ CONFIG_FUSION_CTL=m # # IEEE 1394 (FireWire) support # + +# +# Enable only one of the two stacks, unless you know what you are doing +# CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m CONFIG_IEEE1394=m - -# -# Subsystem Options -# -# CONFIG_IEEE1394_VERBOSEDEBUG is not set - -# -# Controllers -# -CONFIG_IEEE1394_PCILYNX=m CONFIG_IEEE1394_OHCI1394=m - -# -# Protocols -# -CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_PCILYNX=m CONFIG_IEEE1394_SBP2=m # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y CONFIG_IEEE1394_ETH1394=m -# CONFIG_IEEE1394_DV1394 is not set CONFIG_IEEE1394_RAWIO=m +CONFIG_IEEE1394_VIDEO1394=m +# CONFIG_IEEE1394_DV1394 is not set +# CONFIG_IEEE1394_VERBOSEDEBUG is not set # CONFIG_I2O is not set # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y -# CONFIG_NETDEVICES_MULTIQUEUE is not set CONFIG_IFB=m CONFIG_DUMMY=m CONFIG_BONDING=m @@ -1455,11 +1466,8 @@ CONFIG_IBMLANA=m # CONFIG_IBM_NEW_EMAC_EMAC4 is not set CONFIG_NET_PCI=y CONFIG_PCNET32=m -# CONFIG_PCNET32_NAPI is not set CONFIG_AMD8111_ETH=m -CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m -# CONFIG_ADAPTEC_STARFIRE_NAPI is not set CONFIG_AC3200=m CONFIG_APRICOT=m CONFIG_B44=m @@ -1491,7 +1499,6 @@ CONFIG_SUNDANCE_MMIO=y CONFIG_TLAN=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y -# CONFIG_VIA_RHINE_NAPI is not set CONFIG_SC92031=m CONFIG_NET_POCKET=y CONFIG_ATP=m @@ -1502,43 +1509,39 @@ CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m CONFIG_E1000=m -CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m -CONFIG_E1000E_ENABLED=y CONFIG_IP1000=m CONFIG_IGB=m +# CONFIG_IGB_LRO is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m -CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m CONFIG_SKY2=m -CONFIG_SK98LIN=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m CONFIG_QLA3XXX=m CONFIG_ATL1=m +CONFIG_ATL1E=m CONFIG_NETDEV_10000=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T1_NAPI=y CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m CONFIG_IXGB=m -# CONFIG_IXGB_NAPI is not set CONFIG_S2IO=m -# CONFIG_S2IO_NAPI is not set CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m # CONFIG_MLX4_CORE is not set CONFIG_TEHUTI=m CONFIG_BNX2X=m +CONFIG_SFC=m # CONFIG_TR is not set # @@ -1580,18 +1583,26 @@ CONFIG_USB_NET_RNDIS_WLAN=m CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_ADM8211=m +CONFIG_MAC80211_HWSIM=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m # CONFIG_ATH5K is not set -CONFIG_IWL4965=m -# CONFIG_IWL4965_QOS is not set -CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y -CONFIG_IWL4965_SENSITIVITY=y -# CONFIG_IWL4965_DEBUG is not set +CONFIG_ATH9K=m +CONFIG_IWLWIFI=m +CONFIG_IWLCORE=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLWIFI_RFKILL=y +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLAGN=m +CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y +CONFIG_IWLAGN_LEDS=y +CONFIG_IWL4965=y +CONFIG_IWL5000=y CONFIG_IWL3945=m -# CONFIG_IWL3945_QOS is not set +CONFIG_IWL3945_RFKILL=y CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y +CONFIG_IWL3945_LEDS=y CONFIG_IWL3945_DEBUG=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -1599,16 +1610,18 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m -# CONFIG_BCM43XX is not set CONFIG_B43=m CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y +CONFIG_B43_PIO=y +CONFIG_B43_LEDS=y CONFIG_B43_RFKILL=y # CONFIG_B43_DEBUG is not set CONFIG_B43LEGACY=m CONFIG_B43LEGACY_PCI_AUTOSELECT=y CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y CONFIG_B43LEGACY_RFKILL=y # CONFIG_B43LEGACY_DEBUG is not set CONFIG_B43LEGACY_DMA=y @@ -1624,14 +1637,20 @@ CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_USB=m CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2X00_LIB_LEDS=y CONFIG_RT2400PCI=m CONFIG_RT2400PCI_RFKILL=y +CONFIG_RT2400PCI_LEDS=y CONFIG_RT2500PCI=m CONFIG_RT2500PCI_RFKILL=y +CONFIG_RT2500PCI_LEDS=y CONFIG_RT61PCI=m CONFIG_RT61PCI_RFKILL=y +CONFIG_RT61PCI_LEDS=y CONFIG_RT2500USB=m +CONFIG_RT2500USB_LEDS=y CONFIG_RT73USB=m +CONFIG_RT73USB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1658,6 +1677,7 @@ CONFIG_USB_ARMLINUX=y CONFIG_USB_EPSON2888=y CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_HSO=m CONFIG_NET_PCMCIA=y CONFIG_PCMCIA_3C589=m CONFIG_PCMCIA_3C574=m @@ -1699,16 +1719,12 @@ CONFIG_ATM_HORIZON=m # CONFIG_ATM_HORIZON_DEBUG is not set CONFIG_ATM_IA=m # CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E_MAYBE=m -CONFIG_ATM_FORE200E_PCA=y -CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y +CONFIG_ATM_FORE200E=m CONFIG_ATM_FORE200E_USE_TASKLET=y CONFIG_ATM_FORE200E_TX_RETRY=16 CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_FORE200E=m CONFIG_ATM_HE=m CONFIG_ATM_HE_USE_SUNI=y -CONFIG_XEN_NETDEV_FRONTEND=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set @@ -1733,7 +1749,15 @@ CONFIG_SLIP_MODE_SLIP6=y # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set CONFIG_VIRTIO_NET=m -CONFIG_ISDN=m +CONFIG_ISDN=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_XHFC=m +CONFIG_MISDN_L1LOOP=m # CONFIG_ISDN_I4L is not set CONFIG_ISDN_CAPI=m CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y @@ -1762,23 +1786,6 @@ CONFIG_ISDN_DIVAS_PRIPCI=y CONFIG_ISDN_DIVAS_DIVACAPI=m CONFIG_ISDN_DIVAS_USERIDI=m CONFIG_ISDN_DIVAS_MAINT=m - -# -# Modular ISDN driver -# -CONFIG_MISDN_DRV=m -# CONFIG_MISDN_MEMDEBUG is not set -CONFIG_MISDN_AVM_FRITZ=y -CONFIG_MISDN_NETJET=y -CONFIG_MISDN_HFCPCI=y -# CONFIG_MISDN_HFCMULTI is not set -CONFIG_MISDN_HFCUSB=y -CONFIG_MISDN_HFCMINI=y -CONFIG_MISDN_XHFC=y -CONFIG_MISDN_SPEEDFAX=y -CONFIG_MISDN_W6692=y -CONFIG_MISDN_DSP=y -CONFIG_MISDN_L1OIP=y # CONFIG_PHONE is not set # @@ -1842,9 +1849,11 @@ CONFIG_SERIO_LIBPS2=y # Character devices # CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_NOZOMI=m @@ -1883,7 +1892,6 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m CONFIG_HVC_DRIVER=y -CONFIG_HVC_XEN=y CONFIG_VIRTIO_CONSOLE=y CONFIG_IPMI_HANDLER=m CONFIG_IPMI_PANIC_EVENT=y @@ -1897,10 +1905,8 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m CONFIG_NVRAM=m -CONFIG_RTC=m -CONFIG_GEN_RTC=m -# CONFIG_GEN_RTC_X is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -1920,7 +1926,6 @@ CONFIG_MWAVE=m CONFIG_CS5535_GPIO=m # CONFIG_RAW_DRIVER is not set CONFIG_HPET=y -# CONFIG_HPET_RTC_IRQ is not set CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m # CONFIG_TCG_TPM is not set @@ -1929,17 +1934,17 @@ CONFIG_DEVPORT=y CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m - -# -# I2C Algorithms -# +CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCF=m CONFIG_I2C_ALGOPCA=m # # I2C Hardware Bus support # + +# +# PC SMBus host controller drivers +# CONFIG_I2C_ALI1535=m CONFIG_I2C_ALI1563=m CONFIG_I2C_ALI15X3=m @@ -1947,48 +1952,62 @@ CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m -CONFIG_I2C_I810=m +CONFIG_I2C_ISCH=m CONFIG_I2C_PIIX4=m CONFIG_I2C_NFORCE2=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_PROSAVAGE=m -CONFIG_I2C_SAVAGE4=m -CONFIG_I2C_SIMTEC=m -CONFIG_SCx200_ACB=m +CONFIG_I2C_NFORCE2_S4985=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m -# CONFIG_I2C_TAOS_EVM is not set -CONFIG_I2C_STUB=m -CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_OCORES=m +CONFIG_I2C_SIMTEC=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +# CONFIG_I2C_TAOS_EVM is not set +CONFIG_I2C_TINY_USB=m + +# +# Graphics adapter I2C/DDC channel drivers +# CONFIG_I2C_VOODOO3=m + +# +# Other I2C/SMBus bus drivers +# CONFIG_I2C_PCA_ISA=m +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_STUB=m +CONFIG_SCx200_ACB=m # # Miscellaneous I2C Chip support # CONFIG_DS1682=m +CONFIG_AT24=m CONFIG_SENSORS_EEPROM=m CONFIG_SENSORS_PCF8574=m CONFIG_PCF8575=m +CONFIG_SENSORS_PCA9539=m CONFIG_SENSORS_PCF8591=m -CONFIG_TPS65010=m CONFIG_SENSORS_MAX6875=m CONFIG_SENSORS_TSL2550=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set - -# -# SPI support -# # CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +# CONFIG_GPIOLIB is not set CONFIG_W1=m CONFIG_W1_CON=y @@ -2015,6 +2034,7 @@ CONFIG_HWMON=m CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m @@ -2038,6 +2058,7 @@ CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m @@ -2137,6 +2158,8 @@ CONFIG_USBPCWATCHDOG=m # CONFIG_SSB_POSSIBLE=y CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y CONFIG_SSB_PCIHOST_POSSIBLE=y CONFIG_SSB_PCIHOST=y CONFIG_SSB_B43_PCI_BRIDGE=y @@ -2149,61 +2172,129 @@ CONFIG_SSB_DRIVER_PCICORE=y # # Multifunction device drivers # +# CONFIG_MFD_CORE is not set CONFIG_MFD_SM501=m +CONFIG_HTC_PASIC3=m +# CONFIG_MFD_TMIO is not set # # Multimedia devices # + +# +# Multimedia core support +# CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m -CONFIG_VIDEO_V4L1=y +# CONFIG_VIDEO_ALLOW_V4L1 is not set CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_VIDEO_V4L2=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_CUSTOMIZE=y +# CONFIG_MEDIA_TUNER_SIMPLE is not set +# CONFIG_MEDIA_TUNER_TDA8290 is not set +# CONFIG_MEDIA_TUNER_TDA827X is not set +# CONFIG_MEDIA_TUNER_TDA18271 is not set +# CONFIG_MEDIA_TUNER_TDA9887 is not set +# CONFIG_MEDIA_TUNER_TEA5761 is not set +# CONFIG_MEDIA_TUNER_TEA5767 is not set +# CONFIG_MEDIA_TUNER_MT20XX is not set +# CONFIG_MEDIA_TUNER_MT2060 is not set +# CONFIG_MEDIA_TUNER_MT2266 is not set +# CONFIG_MEDIA_TUNER_MT2131 is not set +# CONFIG_MEDIA_TUNER_QT1010 is not set +# CONFIG_MEDIA_TUNER_XC2028 is not set +# CONFIG_MEDIA_TUNER_XC5000 is not set +# CONFIG_MEDIA_TUNER_MXL5005S is not set +# CONFIG_MEDIA_TUNER_MXL5007T is not set +CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TDA9875 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS5345 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_M52790 is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set + +# +# Video decoders +# +# CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_TCM825X is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_TVP5150 is not set + +# +# Video and audio decoders +# +# CONFIG_VIDEO_CX25840 is not set + +# +# MPEG video encoders +# +# CONFIG_VIDEO_CX2341X is not set + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_VIVI is not set # CONFIG_VIDEO_BT848 is not set -# CONFIG_VIDEO_PMS is not set -# CONFIG_VIDEO_BWQCAM is not set -# CONFIG_VIDEO_CQCAM is not set -# CONFIG_VIDEO_W9966 is not set -# CONFIG_VIDEO_CPIA is not set -# CONFIG_VIDEO_CPIA2 is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set -# CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_STRADIS is not set -# CONFIG_VIDEO_ZORAN is not set -# CONFIG_VIDEO_MEYE is not set # CONFIG_VIDEO_SAA7134 is not set -# CONFIG_VIDEO_MXB is not set -# CONFIG_VIDEO_DPC is not set # CONFIG_VIDEO_HEXIUM_ORION is not set # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_CX88 is not set # CONFIG_VIDEO_CX23885 is not set -# CONFIG_VIDEO_IVTV is not set +# CONFIG_VIDEO_AU0828 is not set +# CONFIG_VIDEO_CX18 is not set # CONFIG_VIDEO_CAFE_CCIC is not set CONFIG_V4L_USB_DRIVERS=y +# CONFIG_USB_VIDEO_CLASS is not set +# CONFIG_USB_GSPCA is not set # CONFIG_VIDEO_PVRUSB2 is not set # CONFIG_VIDEO_EM28XX is not set # CONFIG_VIDEO_USBVISION is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_QUICKCAM_MESSENGER is not set # CONFIG_USB_ET61X251 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set -# CONFIG_USB_W9968CF is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set # CONFIG_USB_SN9C102 is not set -# CONFIG_USB_STV680 is not set # CONFIG_USB_ZC0301 is not set -# CONFIG_USB_PWC is not set # CONFIG_USB_ZR364XX is not set # CONFIG_USB_STKWEBCAM is not set +# CONFIG_USB_S2255 is not set +# CONFIG_SOC_CAMERA is not set +# CONFIG_VIDEO_SH_MOBILE_CEU is not set CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_CADET is not set # CONFIG_RADIO_RTRACK is not set @@ -2221,8 +2312,6 @@ CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_ZOLTRIX is not set # CONFIG_USB_DSBR is not set # CONFIG_USB_SI470X is not set -CONFIG_DVB_CORE=m -# CONFIG_DVB_CORE_ATTACH is not set CONFIG_DVB_CAPTURE_DRIVERS=y # @@ -2239,6 +2328,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # CONFIG_DVB_TTUSB_BUDGET is not set # CONFIG_DVB_TTUSB_DEC is not set # CONFIG_DVB_CINERGYT2 is not set +# CONFIG_DVB_SIANO_SMS1XXX is not set # # Supported FlexCopII (B2C2) Adapters @@ -2266,14 +2356,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # # DVB-S (satellite) frontends # -# CONFIG_DVB_STV0299 is not set # CONFIG_DVB_CX24110 is not set # CONFIG_DVB_CX24123 is not set -# CONFIG_DVB_TDA8083 is not set # CONFIG_DVB_MT312 is not set -# CONFIG_DVB_VES1X93 is not set # CONFIG_DVB_S5H1420 is not set +# CONFIG_DVB_STV0299 is not set +# CONFIG_DVB_TDA8083 is not set # CONFIG_DVB_TDA10086 is not set +# CONFIG_DVB_VES1X93 is not set +# CONFIG_DVB_TUNER_ITD1000 is not set +# CONFIG_DVB_TDA826X is not set +# CONFIG_DVB_TUA6100 is not set # # DVB-T (terrestrial) frontends @@ -2282,6 +2375,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # CONFIG_DVB_SP887X is not set # CONFIG_DVB_CX22700 is not set # CONFIG_DVB_CX22702 is not set +# CONFIG_DVB_DRX397XD is not set # CONFIG_DVB_L64781 is not set # CONFIG_DVB_TDA1004X is not set # CONFIG_DVB_NXT6000 is not set @@ -2291,6 +2385,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # CONFIG_DVB_DIB3000MC is not set # CONFIG_DVB_DIB7000M is not set # CONFIG_DVB_DIB7000P is not set +# CONFIG_DVB_TDA10048 is not set # # DVB-C (cable) frontends @@ -2309,27 +2404,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # CONFIG_DVB_BCM3510 is not set # CONFIG_DVB_LGDT330X is not set # CONFIG_DVB_S5H1409 is not set +# CONFIG_DVB_AU8522 is not set +# CONFIG_DVB_S5H1411 is not set # -# Tuners/PLL support +# Digital terrestrial only tuners/PLL # # CONFIG_DVB_PLL is not set -# CONFIG_DVB_TDA826X is not set -# CONFIG_DVB_TDA827X is not set -# CONFIG_DVB_TDA18271 is not set -# CONFIG_DVB_TUNER_QT1010 is not set -# CONFIG_DVB_TUNER_MT2060 is not set -# CONFIG_DVB_TUNER_MT2266 is not set -# CONFIG_DVB_TUNER_MT2131 is not set # CONFIG_DVB_TUNER_DIB0070 is not set -# CONFIG_DVB_TUNER_XC5000 is not set # -# Miscellaneous devices +# SEC control devices for DVB-S # # CONFIG_DVB_LNBP21 is not set +# CONFIG_DVB_ISL6405 is not set # CONFIG_DVB_ISL6421 is not set -# CONFIG_DVB_TUA6100 is not set CONFIG_DAB=y # CONFIG_USB_DABUSB is not set @@ -2367,11 +2456,11 @@ CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set CONFIG_FB_SVGALIB=m # CONFIG_FB_MACMODES is not set CONFIG_FB_BACKLIGHT=y @@ -2392,7 +2481,7 @@ CONFIG_FB_ASILIANT=y CONFIG_FB_UVESA=m CONFIG_FB_VESA=y CONFIG_FB_EFI=y -CONFIG_FB_HECUBA=m +# CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_NVIDIA=m @@ -2447,20 +2536,22 @@ CONFIG_FB_TRIDENT=m CONFIG_FB_TRIDENT_ACCEL=y CONFIG_FB_ARK=m CONFIG_FB_PM3=m +# CONFIG_FB_CARMINE is not set CONFIG_FB_GEODE=y CONFIG_FB_GEODE_LX=m CONFIG_FB_GEODE_GX=m -CONFIG_FB_GEODE_GX_SET_FBSIZE=y -CONFIG_FB_GEODE_GX_FBSIZE=0x1600000 CONFIG_FB_GEODE_GX1=m CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_ILI9320 is not set +CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CORGI=m CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_CARILLO_RANCH=m +CONFIG_BACKLIGHT_MBP_NVIDIA=m # # Display device support @@ -2489,36 +2580,23 @@ CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y - -# -# Sound -# CONFIG_SOUND=m - -# -# Advanced Linux Sound Architecture -# CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_SEQUENCER=m -# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y -# CONFIG_SND_SEQUENCER_OSS is not set -CONFIG_SND_RTCTIMER=m -CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y +CONFIG_SND_SEQUENCER_OSS=y # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set - -# -# Generic devices -# +CONFIG_SND_DRIVERS=y CONFIG_SND_DUMMY=m # CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set @@ -2526,10 +2604,7 @@ CONFIG_SND_DUMMY=m # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set # CONFIG_SND_PORTMAN2X4 is not set - -# -# ISA devices -# +CONFIG_SND_ISA=y # CONFIG_SND_ADLIB is not set # CONFIG_SND_AD1816A is not set # CONFIG_SND_AD1848 is not set @@ -2560,10 +2635,7 @@ CONFIG_SND_DUMMY=m # CONFIG_SND_SGALAXY is not set # CONFIG_SND_SSCAPE is not set # CONFIG_SND_WAVEFRONT is not set - -# -# PCI devices -# +CONFIG_SND_PCI=y # CONFIG_SND_AD1889 is not set # CONFIG_SND_ALS300 is not set # CONFIG_SND_ALS4000 is not set @@ -2573,6 +2645,7 @@ CONFIG_SND_DUMMY=m # CONFIG_SND_AU8810 is not set # CONFIG_SND_AU8820 is not set # CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set # CONFIG_SND_AZT3328 is not set # CONFIG_SND_BT87X is not set # CONFIG_SND_CA0106 is not set @@ -2626,36 +2699,14 @@ CONFIG_SND_DUMMY=m # CONFIG_SND_VIRTUOSO is not set # CONFIG_SND_VX222 is not set # CONFIG_SND_YMFPCI is not set - -# -# USB devices -# +CONFIG_SND_USB=y # CONFIG_SND_USB_AUDIO is not set # CONFIG_SND_USB_USX2Y is not set # CONFIG_SND_USB_CAIAQ is not set - -# -# PCMCIA devices -# +CONFIG_SND_PCMCIA=y # CONFIG_SND_VXPOCKET is not set # CONFIG_SND_PDAUDIOCF is not set - -# -# System on Chip audio support -# # CONFIG_SND_SOC is not set - -# -# SoC Audio support for SuperH -# - -# -# ALSA SoC audio for Freescale SOCs -# - -# -# Open Sound System -# # CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y @@ -2690,16 +2741,18 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_SUSPEND=y -# CONFIG_USB_PERSIST is not set # CONFIG_USB_OTG is not set +# CONFIG_USB_MON is not set # # USB Host Controller Drivers # +# CONFIG_USB_C67X00_HCD is not set CONFIG_USB_EHCI_HCD=m # CONFIG_USB_EHCI_ROOT_HUB_TT is not set # CONFIG_USB_EHCI_TT_NEWSCHED is not set CONFIG_USB_ISP116X_HCD=m +# CONFIG_USB_ISP1760_HCD is not set CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set @@ -2711,11 +2764,16 @@ CONFIG_USB_SL811_HCD=m # CONFIG_USB_SL811_CS is not set CONFIG_USB_R8A66597_HCD=m +# +# Enable Host or Gadget support to see Inventra options +# + # # USB Device Class drivers # CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' @@ -2735,7 +2793,9 @@ CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_ONETOUCH=y CONFIG_USB_STORAGE_KARMA=y +CONFIG_USB_STORAGE_CYPRESS_ATACB=y # CONFIG_USB_LIBUSUAL is not set # @@ -2743,7 +2803,6 @@ CONFIG_USB_STORAGE_KARMA=y # # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set -# CONFIG_USB_MON is not set # # USB port drivers @@ -2753,7 +2812,6 @@ CONFIG_USB_SERIAL=m CONFIG_USB_EZUSB=y # CONFIG_USB_SERIAL_GENERIC is not set CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_AIRPRIME=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_CH341=m @@ -2779,9 +2837,11 @@ CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_MOS7720=m CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m # CONFIG_USB_SERIAL_NAVMAN is not set CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_SPCP8X5=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set @@ -2799,7 +2859,6 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m # CONFIG_USB_ADUTUX is not set -CONFIG_USB_AUERSWALD=m # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m @@ -2817,6 +2876,7 @@ CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_TRANCEVIBRATOR is not set CONFIG_USB_IOWARRIOR=m # CONFIG_USB_TEST is not set +CONFIG_USB_ISIGHTFW=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m @@ -2833,14 +2893,17 @@ CONFIG_MMC=m CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_SDIO_UART=m +CONFIG_MMC_TEST=m # # MMC/SD Host Controller Drivers # CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -2861,7 +2924,9 @@ CONFIG_LEDS_CLASS=m # # LED drivers # +CONFIG_LEDS_PCA9532=m CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m # # LED Triggers @@ -2870,15 +2935,13 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +# CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set # CONFIG_EDAC is not set CONFIG_RTC_LIB=m CONFIG_RTC_CLASS=m -# -# Conflicting RTC option has been selected, check GEN_RTC and RTC -# - # # RTC interfaces # @@ -2903,6 +2966,7 @@ CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m # CONFIG_RTC_DRV_M41T80_WDT is not set CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m # # SPI RTC drivers @@ -2935,22 +2999,25 @@ CONFIG_DMA_ENGINE=y # DMA Clients # CONFIG_NET_DMA=y +CONFIG_DMATEST=m CONFIG_DCA=m # CONFIG_AUXDISPLAY is not set - -# -# Userspace I/O -# CONFIG_UIO=m CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_SMX=m # # Firmware Drivers # # CONFIG_EDD is not set +CONFIG_FIRMWARE_MEMMAP=y # CONFIG_DELL_RBU is not set # CONFIG_DCDBAS is not set CONFIG_DMIID=y +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m # # File systems @@ -2983,9 +3050,9 @@ CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y -# CONFIG_XFS_SECURITY is not set CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set +CONFIG_XFS_DEBUG=y # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set CONFIG_DNOTIFY=y @@ -3055,12 +3122,14 @@ CONFIG_JFFS2_RUBIN=y CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_JFFS2_CMODE_FAVOURLZO is not set +# CONFIG_UBIFS_FS is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set @@ -3071,19 +3140,16 @@ CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y -# CONFIG_NFS_DIRECTIO is not set CONFIG_NFSD=m CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set # CONFIG_NFSD_V4 is not set -CONFIG_NFSD_TCP=y CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m -# CONFIG_SUNRPC_BIND34 is not set CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m @@ -3092,6 +3158,7 @@ CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y # CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set CONFIG_CIFS_XATTR=y # CONFIG_CIFS_POSIX is not set # CONFIG_CIFS_DEBUG2 is not set @@ -3154,18 +3221,31 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y # CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set CONFIG_UNUSED_SYMBOLS=y # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_HAVE_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +# CONFIG_FTRACE is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SYSPROF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_STRICT_DEVMEM is not set +CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y -CONFIG_X86_FIND_SMP_CONFIG=y -CONFIG_X86_MPPARSE=y +# CONFIG_4KSTACKS is not set CONFIG_DOUBLEFAULT=y CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 @@ -3176,6 +3256,7 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_UDELAY is not set # CONFIG_IO_DELAY_NONE is not set CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_OPTIMIZE_INLINING is not set # # Security options @@ -3189,56 +3270,89 @@ CONFIG_ASYNC_CORE=m CONFIG_ASYNC_MEMCPY=m CONFIG_ASYNC_XOR=m CONFIG_CRYPTO=y + +# +# Crypto core or helper +# CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_SEQIV=m CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_GF128MUL=m +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_XCBC=m -# CONFIG_CRYPTO_NULL is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m # CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_TWOFISH_586=m -CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SALSA20=m CONFIG_CRYPTO_SALSA20_586=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m + +# +# Compression +# CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CAMELLIA=m -# CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m @@ -3262,8 +3376,11 @@ CONFIG_VIRTIO_BALLOON=m # Library routines # CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m CONFIG_CRC_ITU_T=m CONFIG_CRC32=y CONFIG_CRC7=m diff --git a/config/rootfiles/common/cdrtools b/config/rootfiles/common/cdrtools index 2105ac928..18d19eebf 100644 --- a/config/rootfiles/common/cdrtools +++ b/config/rootfiles/common/cdrtools @@ -32,3 +32,204 @@ usr/bin/mkisofs #usr/man/man8/mkhybrid.8 #usr/man/man8/mkisofs.8 #usr/sbin/rscsi +#etc/default/cdrecord +#etc/default/rscsi +#usr/bin/btcflash +#usr/bin/scgskeleton +#usr/include/scg +#usr/include/scg/aspi-dos.h +#usr/include/scg/aspi-win32.h +#usr/include/scg/scgcmd.h +#usr/include/scg/scgio.h +#usr/include/scg/scgops.h +#usr/include/scg/scsicdb.h +#usr/include/scg/scsidefs.h +#usr/include/scg/scsireg.h +#usr/include/scg/scsisense.h +#usr/include/scg/scsitransp.h +#usr/include/scg/spti-wnt.h +#usr/include/scg/srb_os2.h +#usr/include/schily +#usr/include/schily/align.h +#usr/include/schily/alloca.h +#usr/include/schily/archdefs.h +#usr/include/schily/avoffset.h +#usr/include/schily/btorder.h +#usr/include/schily/ccomdefs.h +#usr/include/schily/checkerr.h +#usr/include/schily/deflts.h +#usr/include/schily/device.h +#usr/include/schily/dirent.h +#usr/include/schily/errno.h +#usr/include/schily/fcntl.h +#usr/include/schily/fetchdir.h +#usr/include/schily/find.h +#usr/include/schily/fnmatch.h +#usr/include/schily/fstream.h +#usr/include/schily/getargs.h +#usr/include/schily/getcwd.h +#usr/include/schily/hostname.h +#usr/include/schily/i586-linux-cc +#usr/include/schily/i586-linux-cc/align.h +#usr/include/schily/i586-linux-cc/avoffset.h +#usr/include/schily/i586-linux-cc/xconfig.h +#usr/include/schily/iconv.h +#usr/include/schily/idcache.h +#usr/include/schily/intcvt.h +#usr/include/schily/ioctl.h +#usr/include/schily/jmpdefs.h +#usr/include/schily/libport.h +#usr/include/schily/librmt.h +#usr/include/schily/maxpath.h +#usr/include/schily/mconfig.h +#usr/include/schily/mman.h +#usr/include/schily/mtio.h +#usr/include/schily/nlsdefs.h +#usr/include/schily/param.h +#usr/include/schily/patmatch.h +#usr/include/schily/prototyp.h +#usr/include/schily/rmtio.h +#usr/include/schily/schily.h +#usr/include/schily/schilyp.h +#usr/include/schily/siconv.h +#usr/include/schily/sigblk.h +#usr/include/schily/signal.h +#usr/include/schily/standard.h +#usr/include/schily/stat.h +#usr/include/schily/stdio.h +#usr/include/schily/stdlib.h +#usr/include/schily/stkframe.h +#usr/include/schily/string.h +#usr/include/schily/sysexits.h +#usr/include/schily/termcap.h +#usr/include/schily/termios.h +#usr/include/schily/time.h +#usr/include/schily/types.h +#usr/include/schily/unistd.h +#usr/include/schily/utime.h +#usr/include/schily/utypes.h +#usr/include/schily/varargs.h +#usr/include/schily/wait.h +#usr/include/schily/walk.h +#usr/include/schily/wchar.h +#usr/include/schily/xconfig.h +#usr/include/schily/xmconfig.h +#usr/lib/libcdrdeflt.a +#usr/lib/libedc_ecc_dec.a +#usr/lib/libfind.a +#usr/lib/libscgcmd.a +#usr/lib/libsiconv.a +#usr/lib/profiled +#usr/lib/profiled/libcdrdeflt.a +#usr/lib/profiled/libdeflt.a +#usr/lib/profiled/libedc_ecc.a +#usr/lib/profiled/libedc_ecc_dec.a +#usr/lib/profiled/libfile.a +#usr/lib/profiled/libfind.a +#usr/lib/profiled/libhfs.a +#usr/lib/profiled/libparanoia.a +#usr/lib/profiled/librscg.a +#usr/lib/profiled/libscg.a +#usr/lib/profiled/libscgcmd.a +#usr/lib/profiled/libschily.a +#usr/lib/profiled/libsiconv.a +#usr/lib/siconv +#usr/lib/siconv/cp10000 +#usr/lib/siconv/cp10006 +#usr/lib/siconv/cp10007 +#usr/lib/siconv/cp10029 +#usr/lib/siconv/cp10079 +#usr/lib/siconv/cp10081 +#usr/lib/siconv/cp1250 +#usr/lib/siconv/cp1251 +#usr/lib/siconv/cp1252 +#usr/lib/siconv/cp1253 +#usr/lib/siconv/cp1254 +#usr/lib/siconv/cp1255 +#usr/lib/siconv/cp1256 +#usr/lib/siconv/cp1257 +#usr/lib/siconv/cp1258 +#usr/lib/siconv/cp437 +#usr/lib/siconv/cp737 +#usr/lib/siconv/cp775 +#usr/lib/siconv/cp850 +#usr/lib/siconv/cp852 +#usr/lib/siconv/cp855 +#usr/lib/siconv/cp857 +#usr/lib/siconv/cp860 +#usr/lib/siconv/cp861 +#usr/lib/siconv/cp862 +#usr/lib/siconv/cp863 +#usr/lib/siconv/cp864 +#usr/lib/siconv/cp865 +#usr/lib/siconv/cp866 +#usr/lib/siconv/cp869 +#usr/lib/siconv/cp874 +#usr/lib/siconv/iso8859-1 +#usr/lib/siconv/iso8859-10 +#usr/lib/siconv/iso8859-11 +#usr/lib/siconv/iso8859-13 +#usr/lib/siconv/iso8859-14 +#usr/lib/siconv/iso8859-15 +#usr/lib/siconv/iso8859-16 +#usr/lib/siconv/iso8859-2 +#usr/lib/siconv/iso8859-3 +#usr/lib/siconv/iso8859-4 +#usr/lib/siconv/iso8859-5 +#usr/lib/siconv/iso8859-6 +#usr/lib/siconv/iso8859-7 +#usr/lib/siconv/iso8859-8 +#usr/lib/siconv/iso8859-9 +#usr/lib/siconv/koi8-r +#usr/lib/siconv/koi8-u +#usr/man/man1/btcflash.1 +#usr/man/man1/rscsi.1 +#usr/man/man8/devdump.8 +#usr/man/man8/isodebug.8 +#usr/man/man8/isodump.8 +#usr/man/man8/isovfy.8 +#usr/share/doc/cdda2wav +#usr/share/doc/cdda2wav/README +#usr/share/doc/cdrecord +#usr/share/doc/cdrecord/README +#usr/share/doc/cdrecord/README.ATAPI +#usr/share/doc/cdrecord/README.DiskT@2 +#usr/share/doc/cdrecord/README.WORM +#usr/share/doc/cdrecord/README.audio +#usr/share/doc/cdrecord/README.cdplus +#usr/share/doc/cdrecord/README.cdrw +#usr/share/doc/cdrecord/README.cdtext +#usr/share/doc/cdrecord/README.clone +#usr/share/doc/cdrecord/README.copy +#usr/share/doc/cdrecord/README.multi +#usr/share/doc/cdrecord/README.parallel +#usr/share/doc/cdrecord/README.raw +#usr/share/doc/cdrecord/README.rscsi +#usr/share/doc/cdrecord/README.solaris-x86-ATAPI-DMA +#usr/share/doc/cdrecord/README.solaris-x86-ata-DMA +#usr/share/doc/cdrecord/README.sony +#usr/share/doc/cdrecord/README.sun-lofi +#usr/share/doc/cdrecord/README.verify +#usr/share/doc/cdrecord/README.volmgt +#usr/share/doc/libparanoia +#usr/share/doc/libparanoia/README.interface +#usr/share/doc/libparanoia/README.paranoia +#usr/share/doc/mkisofs +#usr/share/doc/mkisofs/README +#usr/share/doc/mkisofs/README.compression +#usr/share/doc/mkisofs/README.eltorito +#usr/share/doc/mkisofs/README.graft_dirs +#usr/share/doc/mkisofs/README.hfs_boot +#usr/share/doc/mkisofs/README.hfs_magic +#usr/share/doc/mkisofs/README.hide +#usr/share/doc/mkisofs/README.joliet +#usr/share/doc/mkisofs/README.macosx +#usr/share/doc/mkisofs/README.mkhybrid +#usr/share/doc/mkisofs/README.prep_boot +#usr/share/doc/mkisofs/README.rootinfo +#usr/share/doc/mkisofs/README.session +#usr/share/doc/mkisofs/README.sort +#usr/share/doc/mkisofs/README.sparcboot +#usr/share/doc/mkisofs/README.sunx86boot +#usr/share/doc/rscsi +#usr/share/doc/rscsi/default-rscsi.sample diff --git a/config/rootfiles/common/klibc b/config/rootfiles/common/klibc index 44b671c22..deb35b9c1 100644 --- a/config/rootfiles/common/klibc +++ b/config/rootfiles/common/klibc @@ -2346,3 +2346,130 @@ usr/lib/klibc/bin/sync #usr/lib/klibc/include/linux/xilinxfb.h #usr/lib/klibc/include/linux/thermal.h #usr/lib/klibc/include/linux/veth.h +#usr/lib/klibc/include/asm-generic/bitops/__fls.h +#usr/lib/klibc/include/asm-generic/dma-coherent.h +#usr/lib/klibc/include/asm-generic/int-l64.h +#usr/lib/klibc/include/asm-generic/int-ll64.h +#usr/lib/klibc/include/asm-generic/syscall.h +#usr/lib/klibc/include/asm/amd_iommu.h +#usr/lib/klibc/include/asm/amd_iommu_types.h +#usr/lib/klibc/include/asm/bios_ebda.h +#usr/lib/klibc/include/asm/ftrace.h +#usr/lib/klibc/include/asm/hugetlb.h +#usr/lib/klibc/include/asm/irq_vectors.h +#usr/lib/klibc/include/asm/kgdb.h +#usr/lib/klibc/include/asm/mmconfig.h +#usr/lib/klibc/include/asm/olpc.h +#usr/lib/klibc/include/asm/pat.h +#usr/lib/klibc/include/asm/pvclock-abi.h +#usr/lib/klibc/include/asm/pvclock.h +#usr/lib/klibc/include/asm/trampoline.h +#usr/lib/klibc/include/asm/traps.h +#usr/lib/klibc/include/asm/uv +#usr/lib/klibc/include/asm/uv/bios.h +#usr/lib/klibc/include/asm/uv/uv_bau.h +#usr/lib/klibc/include/asm/uv/uv_hub.h +#usr/lib/klibc/include/asm/uv/uv_mmrs.h +#usr/lib/klibc/include/asm/visws +#usr/lib/klibc/include/asm/visws/cobalt.h +#usr/lib/klibc/include/asm/visws/lithium.h +#usr/lib/klibc/include/asm/visws/piix4.h +#usr/lib/klibc/include/asm/visws/sgivw.h +#usr/lib/klibc/include/asm/xen/events.h +#usr/lib/klibc/include/asm/xen/grant_table.h +#usr/lib/klibc/include/asm/xen/interface_32.h +#usr/lib/klibc/include/asm/xen/interface_64.h +#usr/lib/klibc/include/asm/xen/page.h +#usr/lib/klibc/include/linux/atmel-pwm-bl.h +#usr/lib/klibc/include/linux/atmel_tc.h +#usr/lib/klibc/include/linux/bounds.h +#usr/lib/klibc/include/linux/brcmphy.h +#usr/lib/klibc/include/linux/byteorder.h +#usr/lib/klibc/include/linux/cnt32_to_63.h +#usr/lib/klibc/include/linux/crc-t10dif.h +#usr/lib/klibc/include/linux/cred.h +#usr/lib/klibc/include/linux/debugobjects.h +#usr/lib/klibc/include/linux/device_cgroup.h +#usr/lib/klibc/include/linux/dlm_plock.h +#usr/lib/klibc/include/linux/dm-dirty-log.h +#usr/lib/klibc/include/linux/dm-io.h +#usr/lib/klibc/include/linux/dm-kcopyd.h +#usr/lib/klibc/include/linux/dma-attrs.h +#usr/lib/klibc/include/linux/dw_dmac.h +#usr/lib/klibc/include/linux/fdtable.h +#usr/lib/klibc/include/linux/firmware-map.h +#usr/lib/klibc/include/linux/ftrace.h +#usr/lib/klibc/include/linux/i2c-pca-platform.h +#usr/lib/klibc/include/linux/i2c/at24.h +#usr/lib/klibc/include/linux/i2c/max732x.h +#usr/lib/klibc/include/linux/ihex.h +#usr/lib/klibc/include/linux/ip_vs.h +#usr/lib/klibc/include/linux/iscsi_ibft.h +#usr/lib/klibc/include/linux/kbuild.h +#usr/lib/klibc/include/linux/kgdb.h +#usr/lib/klibc/include/linux/leds-pca9532.h +#usr/lib/klibc/include/linux/lmb.h +#usr/lib/klibc/include/linux/mISDNhw.h +#usr/lib/klibc/include/linux/math64.h +#usr/lib/klibc/include/linux/mbus.h +#usr/lib/klibc/include/linux/mfd/core.h +#usr/lib/klibc/include/linux/mfd/htc-egpio.h +#usr/lib/klibc/include/linux/mfd/htc-pasic3.h +#usr/lib/klibc/include/linux/mfd/t7l66xb.h +#usr/lib/klibc/include/linux/mfd/tc6387xb.h +#usr/lib/klibc/include/linux/mfd/tc6393xb.h +#usr/lib/klibc/include/linux/mfd/tmio.h +#usr/lib/klibc/include/linux/mmiotrace.h +#usr/lib/klibc/include/linux/mmu_notifier.h +#usr/lib/klibc/include/linux/mroute6.h +#usr/lib/klibc/include/linux/netfilter/nf_conntrack_dccp.h +#usr/lib/klibc/include/linux/netfilter/xt_IMQ.h +#usr/lib/klibc/include/linux/netfilter_bridge/ebt_ip6.h +#usr/lib/klibc/include/linux/netfilter_bridge/ebt_nflog.h +#usr/lib/klibc/include/linux/nfs_iostat.h +#usr/lib/klibc/include/linux/of_gpio.h +#usr/lib/klibc/include/linux/of_i2c.h +#usr/lib/klibc/include/linux/of_spi.h +#usr/lib/klibc/include/linux/pci-aspm.h +#usr/lib/klibc/include/linux/pim.h +#usr/lib/klibc/include/linux/pm_wakeup.h +#usr/lib/klibc/include/linux/pwm.h +#usr/lib/klibc/include/linux/pwm_backlight.h +#usr/lib/klibc/include/linux/ratelimit.h +#usr/lib/klibc/include/linux/rculist.h +#usr/lib/klibc/include/linux/regulator +#usr/lib/klibc/include/linux/regulator/bq24022.h +#usr/lib/klibc/include/linux/regulator/consumer.h +#usr/lib/klibc/include/linux/regulator/driver.h +#usr/lib/klibc/include/linux/regulator/fixed.h +#usr/lib/klibc/include/linux/regulator/machine.h +#usr/lib/klibc/include/linux/semaphore.h +#usr/lib/klibc/include/linux/seq_file_net.h +#usr/lib/klibc/include/linux/smc911x.h +#usr/lib/klibc/include/linux/smc91x.h +#usr/lib/klibc/include/linux/spi/ds1305.h +#usr/lib/klibc/include/linux/spi/max7301.h +#usr/lib/klibc/include/linux/spi/orion_spi.h +#usr/lib/klibc/include/linux/ssb/ssb_driver_gige.h +#usr/lib/klibc/include/linux/swab.h +#usr/lib/klibc/include/linux/tracehook.h +#usr/lib/klibc/include/linux/typecheck.h +#usr/lib/klibc/include/linux/unaligned +#usr/lib/klibc/include/linux/unaligned/access_ok.h +#usr/lib/klibc/include/linux/unaligned/be_byteshift.h +#usr/lib/klibc/include/linux/unaligned/be_memmove.h +#usr/lib/klibc/include/linux/unaligned/be_struct.h +#usr/lib/klibc/include/linux/unaligned/generic.h +#usr/lib/klibc/include/linux/unaligned/le_byteshift.h +#usr/lib/klibc/include/linux/unaligned/le_memmove.h +#usr/lib/klibc/include/linux/unaligned/le_struct.h +#usr/lib/klibc/include/linux/unaligned/memmove.h +#usr/lib/klibc/include/linux/unaligned/packed_struct.h +#usr/lib/klibc/include/linux/usb/association.h +#usr/lib/klibc/include/linux/usb/atmel_usba_udc.h +#usr/lib/klibc/include/linux/usb/c67x00.h +#usr/lib/klibc/include/linux/usb/composite.h +#usr/lib/klibc/include/linux/usb/irda.h +#usr/lib/klibc/include/linux/usb/musb.h +#usr/lib/klibc/include/linux/virtio_rng.h +#usr/lib/klibc/include/linux/wm97xx.h diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux index a5f1f729a..2567442ea 100644 --- a/config/rootfiles/common/linux +++ b/config/rootfiles/common/linux @@ -1501,3 +1501,192 @@ sbin/gen_init_cpio #lib/modules/KVER-ipfire/modules.alias.bin #lib/modules/KVER-ipfire/modules.dep.bin #lib/modules/KVER-ipfire/modules.symbols.bin +#lib/firmware/atmsar11.fw +#lib/firmware/cpia2 +#lib/firmware/cpia2/stv0672_vp4.bin +#lib/firmware/dabusb +#lib/firmware/dabusb/bitstream.bin +#lib/firmware/dabusb/firmware.fw +#lib/firmware/dsp56k +#lib/firmware/dsp56k/bootstrap.bin +#lib/firmware/edgeport +#lib/firmware/edgeport/boot.fw +#lib/firmware/edgeport/boot2.fw +#lib/firmware/edgeport/down.fw +#lib/firmware/edgeport/down2.fw +#lib/firmware/edgeport/down3.bin +#lib/firmware/emi26 +#lib/firmware/emi26/bitstream.fw +#lib/firmware/emi26/firmware.fw +#lib/firmware/emi26/loader.fw +#lib/firmware/emi62 +#lib/firmware/emi62/bitstream.fw +#lib/firmware/emi62/loader.fw +#lib/firmware/emi62/midi.fw +#lib/firmware/emi62/spdif.fw +#lib/firmware/ess +#lib/firmware/ess/maestro3_assp_kernel.fw +#lib/firmware/ess/maestro3_assp_minisrc.fw +#lib/firmware/intelliport2.bin +#lib/firmware/kaweth +lib/firmware/kaweth/new_code.bin +lib/firmware/kaweth/new_code_fix.bin +lib/firmware/kaweth/trigger_code.bin +lib/firmware/kaweth/trigger_code_fix.bin +#lib/firmware/keyspan +#lib/firmware/keyspan/mpr.fw +#lib/firmware/keyspan/usa18x.fw +#lib/firmware/keyspan/usa19.fw +#lib/firmware/keyspan/usa19qi.fw +#lib/firmware/keyspan/usa19qw.fw +#lib/firmware/keyspan/usa19w.fw +#lib/firmware/keyspan/usa28.fw +#lib/firmware/keyspan/usa28x.fw +#lib/firmware/keyspan/usa28xa.fw +#lib/firmware/keyspan/usa28xb.fw +#lib/firmware/keyspan/usa49w.fw +#lib/firmware/keyspan/usa49wlc.fw +#lib/firmware/keyspan_pda +#lib/firmware/keyspan_pda/keyspan_pda.fw +#lib/firmware/keyspan_pda/xircom_pgs.fw +#lib/firmware/korg +#lib/firmware/korg/k1212.dsp +#lib/firmware/sb16 +#lib/firmware/sb16/alaw_main.csp +#lib/firmware/sb16/ima_adpcm_capture.csp +#lib/firmware/sb16/ima_adpcm_init.csp +#lib/firmware/sb16/ima_adpcm_playback.csp +#lib/firmware/sb16/mulaw_main.csp +#lib/firmware/ti_3410.fw +#lib/firmware/ti_5052.fw +#lib/firmware/tr_smctr.bin +#lib/firmware/ttusb-budget +#lib/firmware/ttusb-budget/dspbootcode.bin +#lib/firmware/vicam +#lib/firmware/vicam/firmware.fw +#lib/firmware/whiteheat.fw +#lib/firmware/whiteheat_loader.fw +#lib/firmware/yamaha +#lib/firmware/yamaha/ds1_ctrl.fw +#lib/firmware/yamaha/ds1_dsp.fw +#lib/firmware/yamaha/ds1e_ctrl.fw +#lib/modules/2.6.27.20-ipfire/kernel/crypto/cts.ko +#lib/modules/2.6.27.20-ipfire/kernel/crypto/rmd128.ko +#lib/modules/2.6.27.20-ipfire/kernel/crypto/rmd160.ko +#lib/modules/2.6.27.20-ipfire/kernel/crypto/rmd256.ko +#lib/modules/2.6.27.20-ipfire/kernel/crypto/rmd320.ko +#lib/modules/2.6.27.20-ipfire/kernel/crypto/sha512_generic.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/acpi/asus_acpi.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/acpi/pci_slot.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/acpi/sbs.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/acpi/sbshc.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/acpi/toshiba_acpi.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/ata/pata_sch.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/bluetooth/btusb.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/char/hw_random/virtio-rng.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/dma/dmatest.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/firmware +#lib/modules/2.6.27.20-ipfire/kernel/drivers/firmware/iscsi_ibft.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/drm.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i810 +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i810/i810.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i830 +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i830/i830.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i915 +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i915/i915.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/mga +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/mga/mga.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/r128 +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/r128/r128.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/radeon +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/radeon/radeon.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/savage +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/savage/savage.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/sis +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/sis/sis.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/tdfx +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/tdfx/tdfx.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/via +#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/via/via.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/hwmon/ad7414.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/hwmon/ibmaem.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/i2c/busses/i2c-isch.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/i2c/busses/i2c-nforce2-s4985.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/i2c/busses/i2c-pca-platform.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/i2c/chips/at24.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/i2c/chips/pca9539.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_l1loop.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/l1oip.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_core.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp_kb1ec.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp_mec2.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp_mg2ec.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp_octwareec.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp_oslec.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dtmf.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/octvqe +#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/octvqe/octvqe.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/leds/leds-pca9532.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/leds/leds-pca955x.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/leds/ledtrig-default-on.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/md/dm-log.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/mfd/htc-pasic3.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/misc/compal-laptop.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/misc/eeepc-laptop.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/misc/hp-wmi.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/misc/hpilo.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/mmc/card/mmc_test.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/mmc/host/sdhci-pci.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/mmc/host/sdricoh_cs.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/mtd/ar7part.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/8390p.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/atl1e +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/atl1e/atl1e.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/atlx +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/atlx/atl1.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/sfc +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/sfc/sfc.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/usb/hso.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/ath9k +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/ath9k/ath9k.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/p54 +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/p54/p54common.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/rtc/rtc-fm3130.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler +#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler/scsi_dh.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler/scsi_dh_alua.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler/scsi_dh_emc.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler/scsi_dh_hp_sw.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler/scsi_dh_rdac.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/uio/uio_pdrv.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/uio/uio_pdrv_genirq.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/uio/uio_smx.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/usb/class/cdc-wdm.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/usb/misc/isight_firmware.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/usb/serial/moto_modem.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/usb/serial/spcp8x5.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/video/backlight/mbp_nvidia_bl.ko +#lib/modules/2.6.27.20-ipfire/kernel/drivers/video/backlight/platform_lcd.ko +#lib/modules/2.6.27.20-ipfire/kernel/lib/crc-t10dif.ko +#lib/modules/2.6.27.20-ipfire/kernel/net/802/garp.ko +#lib/modules/2.6.27.20-ipfire/kernel/net/802/stp.ko +#lib/modules/2.6.27.20-ipfire/kernel/net/bridge/netfilter/ebt_nflog.ko +#lib/modules/2.6.27.20-ipfire/kernel/net/ipv4/netfilter/nf_nat_proto_dccp.ko +#lib/modules/2.6.27.20-ipfire/kernel/net/ipv4/netfilter/nf_nat_proto_sctp.ko +#lib/modules/2.6.27.20-ipfire/kernel/net/ipv4/netfilter/nf_nat_proto_udplite.ko +#lib/modules/2.6.27.20-ipfire/kernel/net/netfilter/nf_conntrack_proto_dccp.ko +#lib/modules/2.6.27.20-ipfire/kernel/net/netfilter/xt_IMQ.ko +#lib/modules/2.6.27.20-ipfire/kernel/net/xfrm/xfrm_ipcomp.ko +#lib/modules/2.6.27.20-ipfire/kernel/sound/core/seq/oss +#lib/modules/2.6.27.20-ipfire/kernel/sound/core/seq/oss/snd-seq-oss.ko +#lib/modules/2.6.27.20-ipfire/kernel/sound/core/seq/snd-seq-dummy.ko +#lib/modules/2.6.27.20-ipfire/kernel/sound/core/seq/snd-seq-midi-event.ko diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware new file mode 100644 index 000000000..8ae06f0e8 --- /dev/null +++ b/config/rootfiles/common/linux-firmware @@ -0,0 +1,69 @@ +lib/firmware/atmsar11.fw +#lib/firmware/cpia2 +lib/firmware/cpia2/stv0672_vp4.bin +#lib/firmware/dabusb +lib/firmware/dabusb/bitstream.bin +lib/firmware/dabusb/firmware.fw +#lib/firmware/dsp56k +lib/firmware/dsp56k/bootstrap.bin +#lib/firmware/edgeport +lib/firmware/edgeport/boot.fw +lib/firmware/edgeport/boot2.fw +lib/firmware/edgeport/down.fw +lib/firmware/edgeport/down2.fw +lib/firmware/edgeport/down3.bin +#lib/firmware/emi26 +lib/firmware/emi26/bitstream.fw +lib/firmware/emi26/firmware.fw +lib/firmware/emi26/loader.fw +#lib/firmware/emi62 +lib/firmware/emi62/bitstream.fw +lib/firmware/emi62/loader.fw +lib/firmware/emi62/midi.fw +lib/firmware/emi62/spdif.fw +#lib/firmware/ess +lib/firmware/ess/maestro3_assp_kernel.fw +lib/firmware/ess/maestro3_assp_minisrc.fw +lib/firmware/intelliport2.bin +#lib/firmware/kaweth +lib/firmware/kaweth/new_code.bin +lib/firmware/kaweth/new_code_fix.bin +lib/firmware/kaweth/trigger_code.bin +lib/firmware/kaweth/trigger_code_fix.bin +#lib/firmware/keyspan +lib/firmware/keyspan/mpr.fw +lib/firmware/keyspan/usa18x.fw +lib/firmware/keyspan/usa19.fw +lib/firmware/keyspan/usa19qi.fw +lib/firmware/keyspan/usa19qw.fw +lib/firmware/keyspan/usa19w.fw +lib/firmware/keyspan/usa28.fw +lib/firmware/keyspan/usa28x.fw +lib/firmware/keyspan/usa28xa.fw +lib/firmware/keyspan/usa28xb.fw +lib/firmware/keyspan/usa49w.fw +lib/firmware/keyspan/usa49wlc.fw +#lib/firmware/keyspan_pda +lib/firmware/keyspan_pda/keyspan_pda.fw +lib/firmware/keyspan_pda/xircom_pgs.fw +#lib/firmware/korg +lib/firmware/korg/k1212.dsp +#lib/firmware/sb16 +lib/firmware/sb16/alaw_main.csp +lib/firmware/sb16/ima_adpcm_capture.csp +lib/firmware/sb16/ima_adpcm_init.csp +lib/firmware/sb16/ima_adpcm_playback.csp +lib/firmware/sb16/mulaw_main.csp +lib/firmware/ti_3410.fw +lib/firmware/ti_5052.fw +lib/firmware/tr_smctr.bin +#lib/firmware/ttusb-budget +lib/firmware/ttusb-budget/dspbootcode.bin +#lib/firmware/vicam +lib/firmware/vicam/firmware.fw +lib/firmware/whiteheat.fw +lib/firmware/whiteheat_loader.fw +#lib/firmware/yamaha +lib/firmware/yamaha/ds1_ctrl.fw +lib/firmware/yamaha/ds1_dsp.fw +lib/firmware/yamaha/ds1e_ctrl.fw diff --git a/config/rootfiles/common/mISDN b/config/rootfiles/common/mISDN index 2bf3264b9..68ea1f871 100644 --- a/config/rootfiles/common/mISDN +++ b/config/rootfiles/common/mISDN @@ -1,42 +1,20 @@ -usr/bin/isdnbridge -usr/bin/loadfirm -usr/bin/mISDNdebugtool -usr/bin/misdnportinfo -usr/bin/sendhwctrl -usr/bin/testcon -usr/bin/testcon_l2 -usr/bin/testlayer1 -usr/bin/testlayer3 -usr/bin/testlib -usr/bin/tstlib -usr/bin/voipisdn +usr/bin/l1oipctrl +usr/bin/misdn_bridge +usr/bin/misdn_cleanl2 +usr/bin/misdn_info +usr/bin/misdn_log +usr/bin/misdn_rename #usr/include/mISDNuser -#usr/include/mISDNuser/asn1.h -#usr/include/mISDNuser/asn1_diversion.h -#usr/include/mISDNuser/bchannel.h -#usr/include/mISDNuser/fsm.h -#usr/include/mISDNuser/g711.h -#usr/include/mISDNuser/helper.h -#usr/include/mISDNuser/ibuffer.h -#usr/include/mISDNuser/isdn_debug.h -#usr/include/mISDNuser/isdn_msg.h +#usr/include/mISDNuser/compat_af_isdn.h #usr/include/mISDNuser/isdn_net.h -#usr/include/mISDNuser/isound.h #usr/include/mISDNuser/l3dss1.h -#usr/include/mISDNuser/mISDNlib.h -#usr/include/mISDNuser/net_l2.h -#usr/include/mISDNuser/net_l3.h -#usr/include/mISDNuser/suppserv.h -#usr/include/mISDNuser/tone.h -#usr/lib/libisdnnet.a -usr/lib/libisdnnet.so -#usr/lib/libisdnnet_pic.a -#usr/lib/libmISDN.a -usr/lib/libmISDN.so -#usr/lib/libmISDN_pic.a -#usr/lib/libsuppserv.a -usr/lib/libsuppserv.so -#usr/lib/libsuppserv_pic.a +#usr/include/mISDNuser/mISDNif.h +#usr/include/mISDNuser/mbuffer.h +#usr/include/mISDNuser/mlayer3.h +#usr/include/mISDNuser/q931.h +#usr/lib/libmisdn.a +usr/lib/libmisdn.so +#usr/lib/libmisdn_pic.a #usr/lib/mISDN usr/lib/mISDN/mISDN.conf.bnx.xsl usr/lib/mISDN/mISDN.conf.hfcmulti.xsl diff --git a/config/rootfiles/core/28/filelists/linux-firmware b/config/rootfiles/core/28/filelists/linux-firmware new file mode 120000 index 000000000..4bf91bca9 --- /dev/null +++ b/config/rootfiles/core/28/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/28/update.sh b/config/rootfiles/core/28/update.sh index 980f5fedd..3898af0e3 100755 --- a/config/rootfiles/core/28/update.sh +++ b/config/rootfiles/core/28/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.25.20" +KVER="2.6.27.20" ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa index 2a759c737..eed22a375 100644 --- a/config/rootfiles/packages/alsa +++ b/config/rootfiles/packages/alsa @@ -333,3 +333,50 @@ usr/share/sounds/alsa #usr/share/sounds/alsa/Rear_Right.wav #usr/share/sounds/alsa/Side_Left.wav #usr/share/sounds/alsa/Side_Right.wav +lib/firmware/pcxhr/dspb1222e.b56 +lib/firmware/pcxhr/dspb1222hr.b56 +lib/firmware/pcxhr/dspb882e.b56 +lib/firmware/pcxhr/dspb882hr.b56 +lib/firmware/pcxhr/dspb924.b56 +lib/firmware/pcxhr/dspd1222.d56 +lib/firmware/pcxhr/dspd222.d56 +lib/firmware/pcxhr/dspd882.d56 +lib/firmware/pcxhr/dspe882.e56 +lib/firmware/pcxhr/dspe924.e56 +lib/firmware/pcxhr/xlxc1222e.dat +lib/firmware/pcxhr/xlxc1222hr.dat +lib/firmware/pcxhr/xlxc222.dat +lib/firmware/pcxhr/xlxc882e.dat +lib/firmware/pcxhr/xlxc882hr.dat +lib/firmware/pcxhr/xlxc924.dat +lib/firmware/pcxhr/xlxint.dat +#usr/local/share/alsa/firmware/pcxhrloader/dspb1222e.b56 +#usr/local/share/alsa/firmware/pcxhrloader/dspb1222hr.b56 +#usr/local/share/alsa/firmware/pcxhrloader/dspb882e.b56 +#usr/local/share/alsa/firmware/pcxhrloader/dspb882hr.b56 +#usr/local/share/alsa/firmware/pcxhrloader/dspb924.b56 +#usr/local/share/alsa/firmware/pcxhrloader/dspd1222.d56 +#usr/local/share/alsa/firmware/pcxhrloader/dspd222.d56 +#usr/local/share/alsa/firmware/pcxhrloader/dspd882.d56 +#usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56 +#usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56 +#usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf +#usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf +#usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf +#usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf +#usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf +#usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf +#usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat +#usr/local/share/alsa/firmware/pcxhrloader/xlxc1222hr.dat +#usr/local/share/alsa/firmware/pcxhrloader/xlxc222.dat +#usr/local/share/alsa/firmware/pcxhrloader/xlxc882e.dat +#usr/local/share/alsa/firmware/pcxhrloader/xlxc882hr.dat +#usr/local/share/alsa/firmware/pcxhrloader/xlxc924.dat +#usr/local/share/alsa/firmware/pcxhrloader/xlxint.dat +#usr/share/alsa/init +#usr/share/alsa/init/00main +#usr/share/alsa/init/default +#usr/share/alsa/init/hda +#usr/share/alsa/init/help +#usr/share/alsa/init/info +#usr/share/alsa/init/test diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk-disabled similarity index 100% rename from config/rootfiles/packages/asterisk rename to config/rootfiles/packages/asterisk-disabled diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 1c6cbbdcf..2e96b8a06 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -33,15 +33,14 @@ * URI-1.35 * Unix-Syslog-0.100 * XML-Parser-2.34 -* alsa-lib-1.0.17 -* alsa-lib-1.0.17-kmod-2.6.25.20 +* alsa-lib-1.0.19 +* alsa-lib-1.0.19-kmod-2.6.27.20 * amavisd-new-2.5.2 * apcupsd-3.14.4 * applejuice-0.31 * arping-2.05 * as86-0.16.17 -* asterisk-1.4.18 -* atl2-2.0.5-kmod-2.6.25.20 +* atl2-2.0.5-kmod-2.6.27.20 * autoconf-2.59 * automake-1.9.6 * backup-ipfire @@ -60,7 +59,7 @@ * calamaris-2.59 * capi4k-utils-2005-07-18 * ccache-2.4 -* cdrtools-2.01 +* cdrtools-2.01.01 * centerim-4.22.1 * clamav-0.94.2 * cmake-2.4.8 @@ -144,7 +143,7 @@ * jpegsrc.v6b * kbd-1.12 * klibc-1.5.14 -* kqemu-1.4.0pre1-kmod-2.6.25.20 +* kqemu-1.4.0pre1-kmod-2.6.27.20 * kudzu-1.2.64 * l7-protocols-2008-12-18 * lame-3.97 @@ -173,7 +172,7 @@ * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 -* linux-2.6.25.20 +* linux-2.6.27.20 * linux-atm-2.4.1 * linux-libc-headers-2.6.12.0 * lm_sensors-3.0.3 @@ -183,8 +182,8 @@ * lynis-1.2.3 * lzo-2.02 * m4-1.4.4 -* mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01 -* madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.25.20 +* mISDNuser-20090322 +* madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.27.20 * make-3.81 * man-db-2.4.3 * man-pages-2.34 @@ -301,7 +300,7 @@ * urlgrabber-3.1.0 * usbutils-0.72 * util-linux-2.12r -* v4l-dvb-e9a442d3b53a-kmod-2.6.25.20 +* v4l-dvb-e9a442d3b53a-kmod-2.6.27.20 * vdr-1.6.0 * vdradmin-am-3.6.4 * vim-7.0 @@ -315,7 +314,7 @@ * whatmask-1.2 * which-2.16 * wireless_tools.30.pre6 -* wpa_supplicant-0.5.11 +* wpa_supplicant-0.6.8 * xfsprogs-2.9.4 * xvidcore-1.2.1 * zlib-1.2.3 diff --git a/lfs/alsa b/lfs/alsa index 00daa7e68..79b32691a 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -24,7 +24,7 @@ include Config -VER = 1.0.17 +VER = 1.0.19 THISAPP = alsa-lib-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ else TARGET = $(DIR_INFO)/$(THISAPP) endif PROG = alsa -PAK_VER = 4 +PAK_VER = 5 DEPS = "" @@ -55,10 +55,10 @@ alsa-utils-$(VER).tar.bz2 = $(DL_FROM)/alsa-utils-$(VER).tar.bz2 alsa-firmware-$(VER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(VER).tar.bz2 alsa-driver-$(VER).tar.bz2 = $(DL_FROM)/alsa-driver-$(VER).tar.bz2 -$(DL_FILE)_MD5 = 9bbbdc502478cdc75074c9ba42c385b3 -alsa-utils-$(VER).tar.bz2_MD5 = 14ccd0c900bf663afb36eac6f92d41d6 -alsa-firmware-$(VER).tar.bz2_MD5 = a334a2b736cc6244162d7cc83247075d -alsa-driver-$(VER).tar.bz2_MD5 = 6044062d13dbfe61c0330fe9915cfdb4 +$(DL_FILE)_MD5 = 73db3666c211e5fb023bb77450cf430d +alsa-utils-$(VER).tar.bz2_MD5 = 5ff0379c707c1a29083233edc9ab4e06 +alsa-firmware-$(VER).tar.bz2_MD5 = bb93a1a58066bdb2308dc7b117df2b67 +alsa-driver-$(VER).tar.bz2_MD5 = 7045d69c49e70bb88278b8015d5eb509 install : $(TARGET) @@ -104,7 +104,7 @@ else cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-utils-$(VER).tar.bz2 - cd $(DIR_SRC)/alsa-utils-$(VER) && ./configure + cd $(DIR_SRC)/alsa-utils-$(VER) && ./configure --disable-xmlto cd $(DIR_SRC)/alsa-utils-$(VER) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_SRC)/alsa-utils-$(VER) && make install cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-firmware-$(VER).tar.bz2 diff --git a/lfs/cdrtools b/lfs/cdrtools index fffd1e696..e36d1fabd 100644 --- a/lfs/cdrtools +++ b/lfs/cdrtools @@ -24,10 +24,10 @@ include Config -VER = 2.01 +VER = 2.01.01a58 -THISAPP = cdrtools-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = cdrtools-2.01.01 +DL_FILE = cdrtools-$(VER).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d44a81460e97ae02931c31188fe8d3fd +$(DL_FILE)_MD5 = 6a17354df11c325bba9941d69e9c0294 install : $(TARGET) @@ -69,9 +69,9 @@ $(subst %,%_MD5,$(objects)) : $(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/$(THISAPP)-mkisofs_iconv-1.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-ascii-2.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrtools-2.01-mkisofs_iconv-1.patch + #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrtools-2.01-ascii-2.patch cd $(DIR_APP) && make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root $(MAKETUNING) cd $(DIR_APP) && make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install @rm -rf $(DIR_APP) diff --git a/lfs/initrd b/lfs/initrd index b4d0e3bcf..39c12d47a 100644 --- a/lfs/initrd +++ b/lfs/initrd @@ -64,8 +64,8 @@ $(TARGET) : cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/ - rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,source,misc/*,kernel/{sound,drivers/{media,video}}} \ - /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan* + rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,source,misc/*,kernel/{sound,drivers/{bluetooth,hwmon,media,video,watchdog}}} \ + /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan* \ cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/ @@ -79,6 +79,9 @@ $(TARGET) : # make new dependencies for installer depmod -a -F /boot/System.map-$(KVER)-ipfire \ -b /install/initrd $(KVER)-ipfire + + # Remove binary depmod files + rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin mksquashfs /install/initrd /install/images/initrd cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log diff --git a/lfs/iptables b/lfs/iptables index 61aa03a7b..99afe2bfc 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # ipp2p 0.8.2-pomng cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1.1-ipp2p-0.8.2-pomng.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1-imq.diff + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.2-imq.patch chmod +x $(DIR_APP)/extensions/.IMQ-test* # hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present diff --git a/lfs/linux b/lfs/linux index dbf63866d..cc4e46c1b 100644 --- a/lfs/linux +++ b/lfs/linux @@ -25,7 +25,7 @@ include Config PATCHLEVEL = .20 -VER = 2.6.25.20 +VER = 2.6.27.20 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,25 +46,25 @@ endif # Top-level Rules ############################################################################### objects =$(DL_FILE) \ - mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz \ + mISDN-20090322.tar.gz \ squashfs3.4.tar.gz \ netfilter-layer7-v2.21.tar.gz \ patch-2.6.16-nath323-1.3.bz2 \ - reiser4-for-2.6.25.patch.bz2 + reiser4-for-2.6.27.19.patch.bz2 $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) netfilter-layer7-v2.21.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz -mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz = $(URL_IPFIRE)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz -reiser4-for-2.6.25.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.25.patch.bz2 +mISDN-20090322.tar.gz = $(URL_IPFIRE)/mISDN-20090322.tar.gz +reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2 -$(DL_FILE)_MD5 = 0da698edccf03e2235abc2830a495114 +$(DL_FILE)_MD5 = 58bd12ef5348e5e44b7d7b678299ff9f netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5 patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6 -mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz_MD5 = a46a2d15bd0341edfbd77d257ed3fe4d -reiser4-for-2.6.25.patch.bz2_MD5 = 4294bbcb39e5ee859b94b09ff4fb1e0c +mISDN-20090322.tar.gz_MD5 = 8495c13ef09dacf4a5e42b93da2ac3fc +reiser4-for-2.6.27.19.patch.bz2_MD5 = 22988387f64f299489b90b484b2642cc install : $(TARGET) @@ -108,15 +108,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch # Reiser4 - cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.25.patch.bz2 | patch -Np1 + cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.27.19.patch.bz2 | patch -Np1 # SquashFS cd $(DIR_SRC) && rm -rf squashfs* cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.4.tar.gz - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.25/squashfs3.4-patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.27-rc4/squashfs3.4-patch + + # ip_conntrack permissions from 440 to 444 +# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch # ipp2p 0.8.2-pomng - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.17-ipp2p-0.8.2-pomng.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.19-ipp2p-0.8.2-pomng.patch # Layer7-patch cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.21 @@ -125,13 +128,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Linux Intermediate Queueing Device ifeq "$(XEN)" "" - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25-imq5.diff + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-imq.patch endif # mISDN - cd $(DIR_SRC) && rm -rf mISDN-* - cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz - cd $(DIR_SRC)/mISDN.git && yes 'yes' | ./std2kern -k /usr/src/linux + cd $(DIR_SRC) && rm -rf mISDN-* && mkdir mISDN-socket + cd $(DIR_SRC)/mISDN-socket && tar xfz $(DIR_DL)/mISDN-20090322.tar.gz + cd $(DIR_SRC)/mISDN-socket && yes 'yes' | ./std2kern -k /usr/src/linux # Cleanup kernel source cd $(DIR_APP) && make mrproper @@ -153,6 +156,7 @@ ifeq "$(SMP)" "1" ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install + cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install else cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage @@ -163,6 +167,7 @@ else ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install + cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install endif ifeq "$(SMP)" "" diff --git a/lfs/mISDN b/lfs/mISDN index 10f28ebaf..587345800 100644 --- a/lfs/mISDN +++ b/lfs/mISDN @@ -24,12 +24,12 @@ include Config -VER = git-081106 +VER = 20090322 -THISAPP = mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01 +THISAPP = mISDNuser-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/mISDNuser.git +DIR_APP = $(DIR_SRC)/mISDNuser TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### @@ -40,8 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4eddac75aac4b997e6f2061e10f20862 - +$(DL_FILE)_MD5 = 90d180518d5bcc8157c290275299e8bc install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -69,7 +68,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) + cd $(DIR_SRC) && mkdir mISDNuser + cd $(DIR_SRC)/mISDNuser && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make MISDNDIR=/usr/src/linux cd $(DIR_APP) && make install MISDNDIR=/usr/src/linux -mkdir -p /usr/lib/mISDN @@ -77,3 +78,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC)/mISDN.git && cp -v config/*.xsl /usr/lib/mISDN @rm -rf $(DIR_SRC)/mISDN* @$(POSTBUILD) + diff --git a/make.sh b/make.sh index d454a6cc5..849b72c17 100755 --- a/make.sh +++ b/make.sh @@ -508,7 +508,7 @@ buildipfire() { ipfiremake libmpeg2 ipfiremake cmake ipfiremake libpri - ipfiremake asterisk +# ipfiremake asterisk ipfiremake gnump3d ipfiremake libsigc++ ipfiremake applejuice diff --git a/src/patches/iptables-1.4.2-imq.patch b/src/patches/iptables-1.4.2-imq.patch new file mode 100644 index 000000000..7fdcab8f9 --- /dev/null +++ b/src/patches/iptables-1.4.2-imq.patch @@ -0,0 +1,99 @@ +diff -Naur iptables-1.4.2/extensions/.IMQ-test iptables/extensions/.IMQ-test +--- iptables-1.4.2/extensions/.IMQ-test 1970-01-01 10:00:00.000000000 +1000 ++++ iptables/extensions/.IMQ-test 2008-06-08 22:41:49.000000000 +1000 +@@ -0,0 +1,3 @@ ++#!/bin/sh ++# True if IMQ target patch is applied. ++[ -f $KERNEL_DIR/include/linux/netfilter/xt_IMQ.h ] && echo IMQ +diff -Naur iptables-1.4.2/extensions/libipt_IMQ.c iptables/extensions/libipt_IMQ.c +--- iptables-1.4.2/extensions/libipt_IMQ.c 1970-01-01 10:00:00.000000000 +1000 ++++ iptables/extensions/libipt_IMQ.c 2008-06-08 22:46:25.000000000 +1000 +@@ -0,0 +1,88 @@ ++/* Shared library add-on to iptables to add IMQ target support. */ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++/* Function which prints out usage message. */ ++static void IMQ_help(void) ++{ ++ printf( ++"IMQ target v%s options:\n" ++" --todev enqueue to imq, defaults to 0\n", ++XTABLES_VERSION); ++} ++ ++static struct option IMQ_opts[] = { ++ { "todev", 1, 0, '1' }, ++ { 0 } ++}; ++ ++/* Initialize the target. */ ++static void IMQ_init(struct xt_entry_target *t) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)t->data; ++ ++ mr->todev = 0; ++} ++ ++/* Function which parses command options; returns true if it ++ ate an option */ ++static int IMQ_parse(int c, char **argv, int invert, unsigned int *flags, ++ const void *entry, struct xt_entry_target **target) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)(*target)->data; ++ ++ switch(c) { ++ case '1': ++ if (check_inverse(optarg, &invert, NULL, 0)) ++ exit_error(PARAMETER_PROBLEM, ++ "Unexpected `!' after --todev"); ++ mr->todev=atoi(optarg); ++ break; ++ default: ++ return 0; ++ } ++ return 1; ++} ++ ++/* Prints out the targinfo. */ ++static void IMQ_print(const void *ip, ++ const struct xt_entry_target *target, ++ int numeric) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)target->data; ++ ++ printf("IMQ: todev %u ", mr->todev); ++} ++ ++/* Saves the union ipt_targinfo in parsable form to stdout. */ ++static void IMQ_save(const void *ip, const struct xt_entry_target *target) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)target->data; ++ ++ printf("--todev %u", mr->todev); ++} ++ ++static struct xtables_target imq = { ++ .name = "IMQ", ++ .version = XTABLES_VERSION, ++ .family = PF_INET, ++ .size = XT_ALIGN(sizeof(struct xt_imq_info)), ++ .userspacesize = XT_ALIGN(sizeof(struct xt_imq_info)), ++ .help = IMQ_help, ++ .init = IMQ_init, ++ .parse = IMQ_parse, ++ .print = IMQ_print, ++ .save = IMQ_save, ++ .extra_opts = IMQ_opts, ++}; ++ ++void _init(void) ++{ ++ xtables_register_target(&imq); ++} diff --git a/src/patches/linux-2.6.27-imq.patch b/src/patches/linux-2.6.27-imq.patch new file mode 100644 index 000000000..f907a0736 --- /dev/null +++ b/src/patches/linux-2.6.27-imq.patch @@ -0,0 +1,1150 @@ +--- a/drivers/net/Kconfig ++++ b/drivers/net/Kconfig +@@ -109,6 +109,129 @@ config EQUALIZER + To compile this driver as a module, choose M here: the module + will be called eql. If unsure, say N. + ++config IMQ ++ tristate "IMQ (intermediate queueing device) support" ++ depends on NETDEVICES && NETFILTER ++ ---help--- ++ The IMQ device(s) is used as placeholder for QoS queueing ++ disciplines. Every packet entering/leaving the IP stack can be ++ directed through the IMQ device where it's enqueued/dequeued to the ++ attached qdisc. This allows you to treat network devices as classes ++ and distribute bandwidth among them. Iptables is used to specify ++ through which IMQ device, if any, packets travel. ++ ++ More information at: http://www.linuximq.net/ ++ ++ To compile this driver as a module, choose M here: the module ++ will be called imq. If unsure, say N. ++ ++choice ++ prompt "IMQ behavior (PRE/POSTROUTING)" ++ depends on IMQ ++ default IMQ_BEHAVIOR_AB ++ help ++ ++ This settings defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ IMQ can work in any of the following ways: ++ ++ PREROUTING | POSTROUTING ++ -----------------|------------------- ++ #1 After NAT | After NAT ++ #2 After NAT | Before NAT ++ #3 Before NAT | After NAT ++ #4 Before NAT | Before NAT ++ ++ The default behavior is to hook before NAT on PREROUTING ++ and after NAT on POSTROUTING (#3). ++ ++ This settings are specially usefull when trying to use IMQ ++ to shape NATed clients. ++ ++ More information can be found at: www.linuximq.net ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_AA ++ bool "IMQ AA" ++ help ++ This settings defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: After NAT ++ POSTROUTING: After NAT ++ ++ More information can be found at: www.linuximq.net ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_AB ++ bool "IMQ AB" ++ help ++ This settings defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: After NAT ++ POSTROUTING: Before NAT ++ ++ More information can be found at: www.linuximq.net ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_BA ++ bool "IMQ BA" ++ help ++ This settings defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: Before NAT ++ POSTROUTING: After NAT ++ ++ More information can be found at: www.linuximq.net ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_BB ++ bool "IMQ BB" ++ help ++ This settings defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: Before NAT ++ POSTROUTING: Before NAT ++ ++ More information can be found at: www.linuximq.net ++ ++ If not sure leave the default settings alone. ++ ++endchoice ++ ++config IMQ_NUM_DEVS ++ ++ int "Number of IMQ devices" ++ range 2 16 ++ depends on IMQ ++ default "16" ++ help ++ ++ This settings defines how many IMQ devices will be ++ created. ++ ++ The default value is 16. ++ ++ More information can be found at: www.linuximq.net ++ ++ If not sure leave the default settings alone. ++ + config TUN + tristate "Universal TUN/TAP device driver support" + select CRC32 +--- a/drivers/net/Makefile ++++ b/drivers/net/Makefile +@@ -144,6 +144,7 @@ obj-$(CONFIG_SLHC) += slhc.o + obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o + + obj-$(CONFIG_DUMMY) += dummy.o ++obj-$(CONFIG_IMQ) += imq.o + obj-$(CONFIG_IFB) += ifb.o + obj-$(CONFIG_MACVLAN) += macvlan.o + obj-$(CONFIG_DE600) += de600.o +--- /dev/null ++++ b/drivers/net/imq.c +@@ -0,0 +1,533 @@ ++/* ++ * Pseudo-driver for the intermediate queue device. ++ * ++ * 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. ++ * ++ * Authors: Patrick McHardy, ++ * ++ * The first version was written by Martin Devera, ++ * ++ * Credits: Jan Rafaj ++ * - Update patch to 2.4.21 ++ * Sebastian Strollo ++ * - Fix "Dead-loop on netdevice imq"-issue ++ * Marcel Sebek ++ * - Update to 2.6.2-rc1 ++ * ++ * After some time of inactivity there is a group taking care ++ * of IMQ again: http://www.linuximq.net ++ * ++ * ++ * 2004/06/30 - New version of IMQ patch to kernels <=2.6.7 ++ * including the following changes: ++ * ++ * - Correction of ipv6 support "+"s issue (Hasso Tepper) ++ * - Correction of imq_init_devs() issue that resulted in ++ * kernel OOPS unloading IMQ as module (Norbert Buchmuller) ++ * - Addition of functionality to choose number of IMQ devices ++ * during kernel config (Andre Correa) ++ * - Addition of functionality to choose how IMQ hooks on ++ * PRE and POSTROUTING (after or before NAT) (Andre Correa) ++ * - Cosmetic corrections (Norbert Buchmuller) (Andre Correa) ++ * ++ * ++ * 2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were ++ * released with almost no problems. 2.6.14-x was released ++ * with some important changes: nfcache was removed; After ++ * some weeks of trouble we figured out that some IMQ fields ++ * in skb were missing in skbuff.c - skb_clone and copy_skb_header. ++ * These functions are correctly patched by this new patch version. ++ * ++ * Thanks for all who helped to figure out all the problems with ++ * 2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX, ++ * Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully ++ * I didn't forget anybody). I apologize again for my lack of time. ++ * ++ * ++ * 2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead ++ * of qdisc_restart() and moved qdisc_run() to tasklet to avoid ++ * recursive locking. New initialization routines to fix 'rmmod' not ++ * working anymore. Used code from ifb.c. (Jussi Kivilinna) ++ * ++ * 2008/08/06 - 2.6.27 - (JK) ++ * - Replaced tasklet with 'netif_schedule()'. ++ * - Cleaned up and added comments for imq_nf_queue(). ++ * ++ * Also, many thanks to pablo Sebastian Greco for making the initial ++ * patch and to those who helped the testing. ++ * ++ * More info at: http://www.linuximq.net/ (Andre Correa) ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ #include ++#endif ++#include ++#include ++#include ++ ++static nf_hookfn imq_nf_hook; ++ ++static struct nf_hook_ops imq_ingress_ipv4 = { ++ .hook = imq_nf_hook, ++ .owner = THIS_MODULE, ++ .pf = PF_INET, ++ .hooknum = NF_INET_PRE_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ .priority = NF_IP_PRI_MANGLE + 1 ++#else ++ .priority = NF_IP_PRI_NAT_DST + 1 ++#endif ++}; ++ ++static struct nf_hook_ops imq_egress_ipv4 = { ++ .hook = imq_nf_hook, ++ .owner = THIS_MODULE, ++ .pf = PF_INET, ++ .hooknum = NF_INET_POST_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) ++ .priority = NF_IP_PRI_LAST ++#else ++ .priority = NF_IP_PRI_NAT_SRC - 1 ++#endif ++}; ++ ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++static struct nf_hook_ops imq_ingress_ipv6 = { ++ .hook = imq_nf_hook, ++ .owner = THIS_MODULE, ++ .pf = PF_INET6, ++ .hooknum = NF_INET_PRE_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ .priority = NF_IP6_PRI_MANGLE + 1 ++#else ++ .priority = NF_IP6_PRI_NAT_DST + 1 ++#endif ++}; ++ ++static struct nf_hook_ops imq_egress_ipv6 = { ++ .hook = imq_nf_hook, ++ .owner = THIS_MODULE, ++ .pf = PF_INET6, ++ .hooknum = NF_INET_POST_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) ++ .priority = NF_IP6_PRI_LAST ++#else ++ .priority = NF_IP6_PRI_NAT_SRC - 1 ++#endif ++}; ++#endif ++ ++#if defined(CONFIG_IMQ_NUM_DEVS) ++static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS; ++#else ++static unsigned int numdevs = IMQ_MAX_DEVS; ++#endif ++ ++static struct net_device *imq_devs_cache[IMQ_MAX_DEVS]; ++ ++static struct net_device_stats *imq_get_stats(struct net_device *dev) ++{ ++ return &dev->stats; ++} ++ ++/* called for packets kfree'd in qdiscs at places other than enqueue */ ++static void imq_skb_destructor(struct sk_buff *skb) ++{ ++ struct nf_queue_entry *entry = skb->nf_queue_entry; ++ ++ if (likely(entry)) { ++ nf_queue_entry_release_refs(entry); ++ kfree(entry); ++ } ++} ++ ++static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict) ++{ ++ int status; ++ ++ if (!entry->next_outfn) { ++ nf_reinject(entry, verdict); ++ return; ++ } ++ ++ status = entry->next_outfn(entry, entry->next_queuenum); ++ if (status < 0) { ++ nf_queue_entry_release_refs(entry); ++ kfree_skb(entry->skb); ++ kfree(entry); ++ } ++} ++ ++static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct nf_queue_entry *entry = skb->nf_queue_entry; ++ ++ BUG_ON(entry == NULL); ++ ++ dev->stats.tx_bytes += skb->len; ++ dev->stats.tx_packets++; ++ ++ skb->imq_flags = 0; ++ skb->destructor = NULL; ++ ++ dev->trans_start = jiffies; ++ imq_nf_reinject(entry, NF_ACCEPT); ++ return 0; ++} ++ ++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num) ++{ ++ struct net_device *dev; ++ struct sk_buff *skb_orig, *skb, *skb_shared; ++ struct Qdisc *q; ++ spinlock_t *root_lock; ++ struct netdev_queue *txq; ++ int users, index; ++ ++ index = entry->skb->imq_flags & IMQ_F_IFMASK; ++ if (unlikely(index > numdevs - 1)) { ++ if (net_ratelimit()) ++ printk(KERN_WARNING ++ "IMQ: invalid device specified, highest is %u\n", ++ numdevs - 1); ++ return -EINVAL; ++ } ++ ++ /* check for imq device by index from cache */ ++ dev = imq_devs_cache[index]; ++ if (unlikely(!dev)) { ++ char buf[8]; ++ ++ /* get device by name and cache result */ ++ snprintf(buf, sizeof(buf), "imq%d", index); ++ dev = dev_get_by_name(&init_net, buf); ++ if (!dev) { ++ /* not found ?!*/ ++ BUG(); ++ return -ENODEV; ++ } ++ ++ imq_devs_cache[index] = dev; ++ } ++ ++ if (unlikely(!(dev->flags & IFF_UP))) { ++ entry->skb->imq_flags = 0; ++ imq_nf_reinject(entry, NF_ACCEPT); ++ return 0; ++ } ++ dev->last_rx = jiffies; ++ ++ skb = entry->skb; ++ skb_orig = NULL; ++ ++ /* skb has owner? => make clone */ ++ if (unlikely(skb->destructor)) { ++ skb_orig = skb; ++ skb = skb_clone(skb, GFP_ATOMIC); ++ if (!skb) ++ return -ENOMEM; ++ entry->skb = skb; ++ } ++ ++ skb->nf_queue_entry = entry; ++ ++ dev->stats.rx_bytes += skb->len; ++ dev->stats.rx_packets++; ++ ++ txq = dev_pick_tx(dev, skb); ++ q = txq->qdisc; ++ ++ if (unlikely(!q->enqueue)) ++ goto packet_not_eaten_by_imq_dev; ++ ++ if (unlikely(!rtnl_trylock())) ++ goto packet_not_eaten_by_imq_dev; ++ ++ root_lock = qdisc_root_lock(q); ++ spin_lock(root_lock); ++ ++ users = atomic_read(&skb->users); ++ ++ skb_shared = skb_get(skb); /* increase reference count by one */ ++ qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */ ++ ++ if (likely(atomic_read(&skb_shared->users) == users + 1)) { ++ kfree_skb(skb_shared); /* decrease reference count by one */ ++ ++ /* imq_skb_destructor frees the skb and entry */ ++ skb->destructor = &imq_skb_destructor; ++ ++ /* cloned? */ ++ if (skb_orig) ++ kfree_skb(skb_orig); /* free original */ ++ ++ /* schedule qdisc dequeue */ ++ netif_tx_schedule_all(dev); ++ ++ spin_unlock(root_lock); ++ __rtnl_unlock(); ++ return 0; ++ } else { ++ /* qdisc dropped packet and decreased skb reference count of ++ * skb, so we don't really want to and try refree as that would ++ * actually destroy the skb. */ ++ spin_unlock(root_lock); ++ __rtnl_unlock(); ++ goto packet_not_eaten_by_imq_dev; ++ } ++ ++packet_not_eaten_by_imq_dev: ++ /* cloned? restore original */ ++ if (skb_orig) { ++ kfree_skb(skb); ++ entry->skb = skb_orig; ++ } ++ return -1; ++} ++ ++static struct nf_queue_handler nfqh = { ++ .name = "imq", ++ .outfn = imq_nf_queue, ++}; ++ ++static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb, ++ const struct net_device *indev, ++ const struct net_device *outdev, ++ int (*okfn)(struct sk_buff *)) ++{ ++ if (pskb->imq_flags & IMQ_F_ENQUEUE) ++ return NF_QUEUE; ++ ++ return NF_ACCEPT; ++} ++ ++static int imq_close(struct net_device *dev) ++{ ++ netif_stop_queue(dev); ++ return 0; ++} ++ ++static int imq_open(struct net_device *dev) ++{ ++ netif_start_queue(dev); ++ return 0; ++} ++ ++static void imq_setup(struct net_device *dev) ++{ ++ dev->hard_start_xmit = imq_dev_xmit; ++ dev->open = imq_open; ++ dev->get_stats = imq_get_stats; ++ dev->stop = imq_close; ++ dev->type = ARPHRD_VOID; ++ dev->mtu = 1500; ++ dev->tx_queue_len = 10000; ++ dev->flags = IFF_NOARP; ++} ++ ++static int imq_validate(struct nlattr *tb[], struct nlattr *data[]) ++{ ++ int ret = 0; ++ ++ if (tb[IFLA_ADDRESS]) { ++ if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) { ++ ret = -EINVAL; ++ goto end; ++ } ++ if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) { ++ ret = -EADDRNOTAVAIL; ++ goto end; ++ } ++ } ++ return 0; ++end: ++ printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret); ++ return ret; ++} ++ ++static struct rtnl_link_ops imq_link_ops __read_mostly = { ++ .kind = "imq", ++ .priv_size = 0, ++ .setup = imq_setup, ++ .validate = imq_validate, ++}; ++ ++static int __init imq_init_hooks(void) ++{ ++ int err; ++ ++ nf_register_queue_imq_handler(&nfqh); ++ ++ err = nf_register_hook(&imq_ingress_ipv4); ++ if (err) ++ goto err1; ++ ++ err = nf_register_hook(&imq_egress_ipv4); ++ if (err) ++ goto err2; ++ ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ err = nf_register_hook(&imq_ingress_ipv6); ++ if (err) ++ goto err3; ++ ++ err = nf_register_hook(&imq_egress_ipv6); ++ if (err) ++ goto err4; ++#endif ++ ++ return 0; ++ ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++err4: ++ nf_unregister_hook(&imq_ingress_ipv6); ++err3: ++ nf_unregister_hook(&imq_egress_ipv4); ++#endif ++err2: ++ nf_unregister_hook(&imq_ingress_ipv4); ++err1: ++ nf_unregister_queue_imq_handler(); ++ return err; ++} ++ ++static int __init imq_init_one(int index) ++{ ++ struct net_device *dev; ++ int ret; ++ ++ dev = alloc_netdev(0, "imq%d", imq_setup); ++ if (!dev) ++ return -ENOMEM; ++ ++ ret = dev_alloc_name(dev, dev->name); ++ if (ret < 0) ++ goto fail; ++ ++ dev->rtnl_link_ops = &imq_link_ops; ++ ret = register_netdevice(dev); ++ if (ret < 0) ++ goto fail; ++ ++ return 0; ++fail: ++ free_netdev(dev); ++ return ret; ++} ++ ++static int __init imq_init_devs(void) ++{ ++ int err, i; ++ ++ if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) { ++ printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n", ++ IMQ_MAX_DEVS); ++ return -EINVAL; ++ } ++ ++ rtnl_lock(); ++ err = __rtnl_link_register(&imq_link_ops); ++ ++ for (i = 0; i < numdevs && !err; i++) ++ err = imq_init_one(i); ++ ++ if (err) { ++ __rtnl_link_unregister(&imq_link_ops); ++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); ++ } ++ rtnl_unlock(); ++ ++ return err; ++} ++ ++static int __init imq_init_module(void) ++{ ++ int err; ++ ++#if defined(CONFIG_IMQ_NUM_DEVS) ++ BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16); ++ BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2); ++ BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK); ++#endif ++ ++ err = imq_init_devs(); ++ if (err) { ++ printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n"); ++ return err; ++ } ++ ++ err = imq_init_hooks(); ++ if (err) { ++ printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n"); ++ rtnl_link_unregister(&imq_link_ops); ++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); ++ return err; ++ } ++ ++ printk(KERN_INFO "IMQ driver loaded successfully.\n"); ++ ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n"); ++#else ++ printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n"); ++#endif ++#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n"); ++#else ++ printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n"); ++#endif ++ ++ return 0; ++} ++ ++static void __exit imq_unhook(void) ++{ ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ nf_unregister_hook(&imq_ingress_ipv6); ++ nf_unregister_hook(&imq_egress_ipv6); ++#endif ++ nf_unregister_hook(&imq_ingress_ipv4); ++ nf_unregister_hook(&imq_egress_ipv4); ++ ++ nf_unregister_queue_imq_handler(); ++} ++ ++static void __exit imq_cleanup_devs(void) ++{ ++ rtnl_link_unregister(&imq_link_ops); ++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); ++} ++ ++static void __exit imq_exit_module(void) ++{ ++ imq_unhook(); ++ imq_cleanup_devs(); ++ printk(KERN_INFO "IMQ driver unloaded successfully.\n"); ++} ++ ++module_init(imq_init_module); ++module_exit(imq_exit_module); ++ ++module_param(numdevs, int, 0); ++MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will " ++ "be created)"); ++MODULE_AUTHOR("http://www.linuximq.net"); ++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See " ++ "http://www.linuximq.net/ for more information."); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS_RTNL_LINK("imq"); ++ +--- /dev/null ++++ b/include/linux/imq.h +@@ -0,0 +1,13 @@ ++#ifndef _IMQ_H ++#define _IMQ_H ++ ++/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */ ++#define IMQ_F_BITS 5 ++ ++#define IMQ_F_IFMASK 0x0f ++#define IMQ_F_ENQUEUE 0x10 ++ ++#define IMQ_MAX_DEVS (IMQ_F_IFMASK + 1) ++ ++#endif /* _IMQ_H */ ++ +--- /dev/null ++++ b/include/linux/netfilter/xt_IMQ.h +@@ -0,0 +1,9 @@ ++#ifndef _XT_IMQ_H ++#define _XT_IMQ_H ++ ++struct xt_imq_info { ++ unsigned int todev; /* target imq device */ ++}; ++ ++#endif /* _XT_IMQ_H */ ++ +--- /dev/null ++++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h +@@ -0,0 +1,10 @@ ++#ifndef _IP6T_IMQ_H ++#define _IP6T_IMQ_H ++ ++/* Backwards compatibility for old userspace */ ++#include ++ ++#define ip6t_imq_info xt_imq_info ++ ++#endif /* _IP6T_IMQ_H */ ++ +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -28,6 +28,9 @@ + #include + #include + #include ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++#include ++#endif + + #define HAVE_ALLOC_SKB /* For the drivers to know */ + #define HAVE_ALIGNABLE_SKB /* Ditto 8) */ +@@ -302,6 +305,13 @@ struct sk_buff { + struct nf_conntrack *nfct; + struct sk_buff *nfct_reasm; + #endif ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ struct nf_queue_entry *nf_queue_entry; ++/* 2.6.27 started using skb->cb for qdiscs. Problem here is that IMQ run qdisc ++ * on wrong layer and skb->cb is already used by TCP. So we need to make qdisc ++ * not use skb, this adds 4 extra bytes to skbuff. */ ++ unsigned int qdisc_skb_cb_pkt_len; ++#endif + #ifdef CONFIG_BRIDGE_NETFILTER + struct nf_bridge_info *nf_bridge; + #endif +@@ -321,6 +331,9 @@ struct sk_buff { + __u8 do_not_encrypt:1; + #endif + /* 0/13/14 bit hole */ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ __u8 imq_flags:IMQ_F_BITS; ++#endif + + #ifdef CONFIG_NET_DMA + dma_cookie_t dma_cookie; +@@ -1638,6 +1651,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src) + dst->nfct_reasm = src->nfct_reasm; + nf_conntrack_get_reasm(src->nfct_reasm); + #endif ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ dst->imq_flags = src->imq_flags; ++ dst->nf_queue_entry = src->nf_queue_entry; ++#endif + #ifdef CONFIG_BRIDGE_NETFILTER + dst->nf_bridge = src->nf_bridge; + nf_bridge_get(src->nf_bridge); +--- a/include/net/netfilter/nf_queue.h ++++ b/include/net/netfilter/nf_queue.h +@@ -13,6 +13,13 @@ struct nf_queue_entry { + struct net_device *indev; + struct net_device *outdev; + int (*okfn)(struct sk_buff *); ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ /* following allow IMQ work when other nf_queue handlers are set up */ ++ int (*next_outfn)(struct nf_queue_entry *entry, ++ unsigned int queuenum); ++ unsigned int next_queuenum; ++#endif + }; + + #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry)) +@@ -30,5 +37,11 @@ extern int nf_unregister_queue_handler(int pf, + const struct nf_queue_handler *qh); + extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh); + extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict); ++extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry); ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh); ++extern void nf_unregister_queue_imq_handler(void); ++#endif + + #endif /* _NF_QUEUE_H */ +--- a/include/net/sch_generic.h ++++ b/include/net/sch_generic.h +@@ -174,7 +174,11 @@ struct tcf_proto + }; + + struct qdisc_skb_cb { ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ unsigned int __imq_do_not_use; ++#else + unsigned int pkt_len; ++#endif + char data[]; + }; + +@@ -275,6 +279,8 @@ extern void qdisc_class_hash_remove(struct Qdisc_class_hash *, struct Qdisc_clas + extern void qdisc_class_hash_grow(struct Qdisc *, struct Qdisc_class_hash *); + extern void qdisc_class_hash_destroy(struct Qdisc_class_hash *); + ++extern struct netdev_queue *dev_pick_tx(struct net_device *dev, ++ struct sk_buff *skb); + extern void dev_init_scheduler(struct net_device *dev); + extern void dev_shutdown(struct net_device *dev); + extern void dev_activate(struct net_device *dev); +@@ -340,7 +346,11 @@ static inline bool qdisc_tx_is_noop(const struct net_device *dev) + + static inline unsigned int qdisc_pkt_len(struct sk_buff *skb) + { ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ return skb->qdisc_skb_cb_pkt_len; /* see skbuff.h why */ ++#else + return qdisc_skb_cb(skb)->pkt_len; ++#endif + } + + /* additional qdisc xmit flags (NET_XMIT_MASK in linux/netdevice.h) */ +@@ -366,7 +376,11 @@ static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch) + + static inline int qdisc_enqueue_root(struct sk_buff *skb, struct Qdisc *sch) + { ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ skb->qdisc_skb_cb_pkt_len = skb->len; /* see skbuff.h why */ ++#else + qdisc_skb_cb(skb)->pkt_len = skb->len; ++#endif + return qdisc_enqueue(skb, sch) & NET_XMIT_MASK; + } + +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -96,6 +96,9 @@ + #include + #include + #include ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++#include ++#endif + #include + #include + #include +@@ -1619,7 +1622,11 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, + struct netdev_queue *txq) + { + if (likely(!skb->next)) { +- if (!list_empty(&ptype_all)) ++ if (!list_empty(&ptype_all) ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ && !(skb->imq_flags & IMQ_F_ENQUEUE) ++#endif ++ ) + dev_queue_xmit_nit(skb, dev); + + if (netif_needs_gso(dev, skb)) { +@@ -1709,8 +1716,7 @@ static u16 simple_tx_hash(struct net_device *dev, struct sk_buff *skb) + return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32); + } + +-static struct netdev_queue *dev_pick_tx(struct net_device *dev, +- struct sk_buff *skb) ++struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb) + { + u16 queue_index = 0; + +@@ -1722,6 +1728,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev, + skb_set_queue_mapping(skb, queue_index); + return netdev_get_tx_queue(dev, queue_index); + } ++EXPORT_SYMBOL(dev_pick_tx); + + /** + * dev_queue_xmit - transmit a buffer +--- a/net/core/rtnetlink.c ++++ b/net/core/rtnetlink.c +@@ -1406,6 +1406,7 @@ EXPORT_SYMBOL(rtnetlink_put_metrics); + EXPORT_SYMBOL(rtnl_lock); + EXPORT_SYMBOL(rtnl_trylock); + EXPORT_SYMBOL(rtnl_unlock); ++EXPORT_SYMBOL(__rtnl_unlock); + EXPORT_SYMBOL(rtnl_is_locked); + EXPORT_SYMBOL(rtnl_unicast); + EXPORT_SYMBOL(rtnl_notify); +--- a/net/core/skbuff.c ++++ b/net/core/skbufc +@@ -436,6 +436,9 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) + new->sp = secpath_get(old->sp); + #endif + memcpy(new->cb, old->cb, sizeof(old->cb)); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ new->qdisc_skb_cb_pkt_len = old->qdisc_skb_cb_pkt_len; ++#endif + new->csum_start = old->csum_start; + new->csum_offset = old->csum_offset; + new->local_df = old->local_df; +@@ -2258,7 +2258,9 @@ + + __copy_skb_header(nskb, skb); + nskb->mac_len = skb->mac_len; +- ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ nskb->qdisc_skb_cb_pkt_len = skb->qdisc_skb_cb_pkt_len; ++#endif + skb_reserve(nskb, headroom); + skb_reset_mac_header(nskb); + skb_set_network_header(nskb, skb->mac_len); +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig +@@ -342,6 +342,18 @@ config NETFILTER_XT_TARGET_DSCP + + To compile it as a module, choose M here. If unsure, say N. + ++config NETFILTER_XT_TARGET_IMQ ++ tristate '"IMQ" target support' ++ depends on NETFILTER_XTABLES ++ depends on IP_NF_MANGLE || IP6_NF_MANGLE ++ select IMQ ++ default m if NETFILTER_ADVANCED=n ++ help ++ This option adds a `IMQ' target which is used to specify if and ++ to which imq device packets should get enqueued/dequeued. ++ ++ To compile it as a module, choose M here. If unsure, say N. ++ + config NETFILTER_XT_TARGET_MARK + tristate '"MARK" target support' + depends on NETFILTER_XTABLES +--- a/net/netfilter/Makefile ++++ b/net/netfilter/Makefile +@@ -42,6 +42,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_CLASSIFY.o + obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o + obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o + obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o ++obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o + obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o + obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o + obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o +--- a/net/netfilter/nf_queue.c ++++ b/net/netfilter/nf_queue.c +@@ -20,6 +20,26 @@ static const struct nf_queue_handler *queue_handler[NPROTO]; + + static DEFINE_MUTEX(queue_handler_mutex); + ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++static const struct nf_queue_handler *queue_imq_handler; ++ ++void nf_register_queue_imq_handler(const struct nf_queue_handler *qh) ++{ ++ mutex_lock(&queue_handler_mutex); ++ rcu_assign_pointer(queue_imq_handler, qh); ++ mutex_unlock(&queue_handler_mutex); ++} ++EXPORT_SYMBOL(nf_register_queue_imq_handler); ++ ++void nf_unregister_queue_imq_handler(void) ++{ ++ mutex_lock(&queue_handler_mutex); ++ rcu_assign_pointer(queue_imq_handler, NULL); ++ mutex_unlock(&queue_handler_mutex); ++} ++EXPORT_SYMBOL(nf_unregister_queue_imq_handler); ++#endif ++ + /* return EBUSY when somebody else is registered, return EEXIST if the + * same handler is registered, return 0 in case of success. */ + int nf_register_queue_handler(int pf, const struct nf_queue_handler *qh) +@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const struct nf_queue_handler *qh) + } + EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers); + +-static void nf_queue_entry_release_refs(struct nf_queue_entry *entry) ++void nf_queue_entry_release_refs(struct nf_queue_entry *entry) + { + /* Release those devices we held, or Alexey will kill me. */ + if (entry->indev) +@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(struct nf_queue_entry *entry) + /* Drop reference to owner of hook which queued us. */ + module_put(entry->elem->owner); + } ++EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs); + + /* + * Any packet that leaves via this function must come back +@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *skb, + #endif + const struct nf_afinfo *afinfo; + const struct nf_queue_handler *qh; ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ const struct nf_queue_handler *qih = NULL; ++#endif + + /* QUEUE == DROP if noone is waiting, to be safe. */ + rcu_read_lock(); + + qh = rcu_dereference(queue_handler[pf]); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ if (pf == PF_INET || pf == PF_INET6) ++#else ++ if (pf == PF_INET) ++#endif ++ qih = rcu_dereference(queue_imq_handler); ++ ++ if (!qh && !qih) ++#else /* !IMQ */ + if (!qh) ++#endif + goto err_unlock; + + afinfo = nf_get_afinfo(pf); +@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *skb, + .indev = indev, + .outdev = outdev, + .okfn = okfn, ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ .next_outfn = qh ? qh->outfn : NULL, ++ .next_queuenum = queuenum, ++#endif + }; + + /* If it's going away, ignore hook. */ +@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *skb, + } + #endif + afinfo->saveroute(skb, entry); ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ if (qih) { ++ status = qih->outfn(entry, queuenum); ++ goto imq_skip_queue; ++ } ++#endif ++ + status = qh->outfn(entry, queuenum); + ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++imq_skip_queue: ++#endif + rcu_read_unlock(); + + if (status < 0) { +--- /dev/null ++++ b/net/netfilter/xt_IMQ.c +@@ -0,0 +1,81 @@ ++/* ++ * This target marks packets to be enqueued to an imq device ++ */ ++#include ++#include ++#include ++#include ++#include ++ ++static unsigned int imq_target(struct sk_buff *pskb, ++ const struct net_device *in, ++ const struct net_device *out, ++ unsigned int hooknum, ++ const struct xt_target *target, ++ const void *targinfo) ++{ ++ const struct xt_imq_info *mr = targinfo; ++ ++ pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE; ++ ++ return XT_CONTINUE; ++} ++ ++static bool imq_checkentry(const char *tablename, ++ const void *entry, ++ const struct xt_target *target, ++ void *targinfo, ++ unsigned int hook_mask) ++{ ++ struct xt_imq_info *mr = targinfo; ++ ++ if (mr->todev > IMQ_MAX_DEVS - 1) { ++ printk(KERN_WARNING ++ "IMQ: invalid device specified, highest is %u\n", ++ IMQ_MAX_DEVS - 1); ++ return 0; ++ } ++ ++ return 1; ++} ++ ++static struct xt_target xt_imq_reg[] __read_mostly = { ++ { ++ .name = "IMQ", ++ .family = AF_INET, ++ .target = imq_target, ++ .targetsize = sizeof(struct xt_imq_info), ++ .table = "mangle", ++ .checkentry = imq_checkentry, ++ .me = THIS_MODULE ++ }, ++ { ++ .name = "IMQ", ++ .family = AF_INET6, ++ .target = imq_target, ++ .targetsize = sizeof(struct xt_imq_info), ++ .table = "mangle", ++ .checkentry = imq_checkentry, ++ .me = THIS_MODULE ++ }, ++}; ++ ++static int __init imq_init(void) ++{ ++ return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg)); ++} ++ ++static void __exit imq_fini(void) ++{ ++ xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg)); ++} ++ ++module_init(imq_init); ++module_exit(imq_fini); ++ ++MODULE_AUTHOR("http://www.linuximq.net"); ++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information."); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS("ipt_IMQ"); ++MODULE_ALIAS("ip6t_IMQ"); ++ +--- a/net/sched/sch_api.c ++++ b/net/sched/sch_api.c +@@ -405,7 +405,11 @@ void qdisc_calculate_pkt_len(struct sk_buff *skb, struct qdisc_size_table *stab) + out: + if (unlikely(pkt_len < 1)) + pkt_len = 1; ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ skb->qdisc_skb_cb_pkt_len = pkt_len; /* see skbuff.h why */ ++#else + qdisc_skb_cb(skb)->pkt_len = pkt_len; ++#endif + } + EXPORT_SYMBOL(qdisc_calculate_pkt_len); + diff --git a/src/patches/linux-2.6.27.19-ipp2p-0.8.2-pomng.patch b/src/patches/linux-2.6.27.19-ipp2p-0.8.2-pomng.patch new file mode 100644 index 000000000..4b99aa629 --- /dev/null +++ b/src/patches/linux-2.6.27.19-ipp2p-0.8.2-pomng.patch @@ -0,0 +1,980 @@ +diff -Naur linux-2.6.27.19.org/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.6.27.19/include/linux/netfilter_ipv4/ipt_ipp2p.h +--- linux-2.6.27.19.org/include/linux/netfilter_ipv4/ipt_ipp2p.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.27.19/include/linux/netfilter_ipv4/ipt_ipp2p.h 2009-03-17 19:31:50.000000000 +0100 +@@ -0,0 +1,31 @@ ++#ifndef __IPT_IPP2P_H ++#define __IPT_IPP2P_H ++#define IPP2P_VERSION "0.8.2-pomng" ++ ++struct ipt_p2p_info { ++ int cmd; ++ int debug; ++}; ++ ++#endif //__IPT_IPP2P_H ++ ++#define SHORT_HAND_IPP2P 1 /* --ipp2p switch*/ ++//#define SHORT_HAND_DATA 4 /* --ipp2p-data switch*/ ++#define SHORT_HAND_NONE 5 /* no short hand*/ ++ ++#define IPP2P_EDK (1 << 1) ++#define IPP2P_DATA_KAZAA (1 << 2) ++#define IPP2P_DATA_EDK (1 << 3) ++#define IPP2P_DATA_DC (1 << 4) ++#define IPP2P_DC (1 << 5) ++#define IPP2P_DATA_GNU (1 << 6) ++#define IPP2P_GNU (1 << 7) ++#define IPP2P_KAZAA (1 << 8) ++#define IPP2P_BIT (1 << 9) ++#define IPP2P_APPLE (1 << 10) ++#define IPP2P_SOUL (1 << 11) ++#define IPP2P_WINMX (1 << 12) ++#define IPP2P_ARES (1 << 13) ++#define IPP2P_MUTE (1 << 14) ++#define IPP2P_WASTE (1 << 15) ++#define IPP2P_XDCC (1 << 16) +diff -Naur linux-2.6.27.19.org/net/ipv4/netfilter/ipt_ipp2p.c linux-2.6.27.19/net/ipv4/netfilter/ipt_ipp2p.c +--- linux-2.6.27.19.org/net/ipv4/netfilter/ipt_ipp2p.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.27.19/net/ipv4/netfilter/ipt_ipp2p.c 2009-03-17 19:31:50.000000000 +0100 +@@ -0,0 +1,911 @@ ++#if defined(MODVERSIONS) ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define get_u8(X,O) (*(__u8 *)(X + O)) ++#define get_u16(X,O) (*(__u16 *)(X + O)) ++#define get_u32(X,O) (*(__u32 *)(X + O)) ++ ++MODULE_AUTHOR("Eicke Friedrich/Klaus Degner "); ++MODULE_DESCRIPTION("An extension to iptables to identify P2P traffic."); ++MODULE_LICENSE("GPL"); ++ ++ ++/*Search for UDP eDonkey/eMule/Kad commands*/ ++int ++udp_search_edk (unsigned char *haystack, int packet_len) ++{ ++ unsigned char *t = haystack; ++ t += 8; ++ ++ switch (t[0]) { ++ case 0xe3: ++ { /*edonkey*/ ++ switch (t[1]) ++ { ++ /* client -> server status request */ ++ case 0x96: ++ if (packet_len == 14) return ((IPP2P_EDK * 100) + 50); ++ break; ++ /* server -> client status request */ ++ case 0x97: if (packet_len == 42) return ((IPP2P_EDK * 100) + 51); ++ break; ++ /* server description request */ ++ /* e3 2a ff f0 .. | size == 6 */ ++ case 0xa2: if ( (packet_len == 14) && ( get_u16(t,2) == __constant_htons(0xfff0) ) ) return ((IPP2P_EDK * 100) + 52); ++ break; ++ /* server description response */ ++ /* e3 a3 ff f0 .. | size > 40 && size < 200 */ ++ //case 0xa3: return ((IPP2P_EDK * 100) + 53); ++ // break; ++ case 0x9a: if (packet_len==26) return ((IPP2P_EDK * 100) + 54); ++ break; ++ ++ case 0x92: if (packet_len==18) return ((IPP2P_EDK * 100) + 55); ++ break; ++ } ++ break; ++ } ++ case 0xe4: ++ { ++ switch (t[1]) ++ { ++ /* e4 20 .. | size == 43 */ ++ case 0x20: if ((packet_len == 43) && (t[2] != 0x00) && (t[34] != 0x00)) return ((IPP2P_EDK * 100) + 60); ++ break; ++ /* e4 00 .. 00 | size == 35 ? */ ++ case 0x00: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 61); ++ break; ++ /* e4 10 .. 00 | size == 35 ? */ ++ case 0x10: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 62); ++ break; ++ /* e4 18 .. 00 | size == 35 ? */ ++ case 0x18: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 63); ++ break; ++ /* e4 52 .. | size = 44 */ ++ case 0x52: if (packet_len == 44 ) return ((IPP2P_EDK * 100) + 64); ++ break; ++ /* e4 58 .. | size == 6 */ ++ case 0x58: if (packet_len == 14 ) return ((IPP2P_EDK * 100) + 65); ++ break; ++ /* e4 59 .. | size == 2 */ ++ case 0x59: if (packet_len == 10 )return ((IPP2P_EDK * 100) + 66); ++ break; ++ /* e4 28 .. | packet_len == 52,77,102,127... */ ++ case 0x28: if (((packet_len-52) % 25) == 0) return ((IPP2P_EDK * 100) + 67); ++ break; ++ /* e4 50 xx xx | size == 4 */ ++ case 0x50: if (packet_len == 12) return ((IPP2P_EDK * 100) + 68); ++ break; ++ /* e4 40 xx xx | size == 48 */ ++ case 0x40: if (packet_len == 56) return ((IPP2P_EDK * 100) + 69); ++ break; ++ } ++ break; ++ } ++ } /* end of switch (t[0]) */ ++ return 0; ++}/*udp_search_edk*/ ++ ++ ++/*Search for UDP Gnutella commands*/ ++int ++udp_search_gnu (unsigned char *haystack, int packet_len) ++{ ++ unsigned char *t = haystack; ++ t += 8; ++ ++ if (memcmp(t, "GND", 3) == 0) return ((IPP2P_GNU * 100) + 51); ++ if (memcmp(t, "GNUTELLA ", 9) == 0) return ((IPP2P_GNU * 100) + 52); ++ return 0; ++}/*udp_search_gnu*/ ++ ++ ++/*Search for UDP KaZaA commands*/ ++int ++udp_search_kazaa (unsigned char *haystack, int packet_len) ++{ ++ unsigned char *t = haystack; ++ ++ if (t[packet_len-1] == 0x00){ ++ t += (packet_len - 6); ++ if (memcmp(t, "KaZaA", 5) == 0) return (IPP2P_KAZAA * 100 +50); ++ } ++ ++ return 0; ++}/*udp_search_kazaa*/ ++ ++/*Search for UDP DirectConnect commands*/ ++int ++udp_search_directconnect (unsigned char *haystack, int packet_len) ++{ ++ unsigned char *t = haystack; ++ if ((*(t + 8) == 0x24) && (*(t + packet_len - 1) == 0x7c)) { ++ t+=8; ++ if (memcmp(t, "SR ", 3) == 0) return ((IPP2P_DC * 100) + 60); ++ if (memcmp(t, "Ping ", 5) == 0) return ((IPP2P_DC * 100) + 61); ++ } ++ return 0; ++}/*udp_search_directconnect*/ ++ ++ ++ ++/*Search for UDP BitTorrent commands*/ ++int ++udp_search_bit (unsigned char *haystack, int packet_len) ++{ ++ switch(packet_len) ++ { ++ case 24: ++ /* ^ 00 00 04 17 27 10 19 80 */ ++ if ((ntohl(get_u32(haystack, 8)) == 0x00000417) && (ntohl(get_u32(haystack, 12)) == 0x27101980)) ++ return (IPP2P_BIT * 100 + 50); ++ break; ++ case 44: ++ if (get_u32(haystack, 16) == __constant_htonl(0x00000400) && get_u32(haystack, 36) == __constant_htonl(0x00000104)) ++ return (IPP2P_BIT * 100 + 51); ++ if (get_u32(haystack, 16) == __constant_htonl(0x00000400)) ++ return (IPP2P_BIT * 100 + 61); ++ break; ++ case 65: ++ if (get_u32(haystack, 16) == __constant_htonl(0x00000404) && get_u32(haystack, 36) == __constant_htonl(0x00000104)) ++ return (IPP2P_BIT * 100 + 52); ++ if (get_u32(haystack, 16) == __constant_htonl(0x00000404)) ++ return (IPP2P_BIT * 100 + 62); ++ break; ++ case 67: ++ if (get_u32(haystack, 16) == __constant_htonl(0x00000406) && get_u32(haystack, 36) == __constant_htonl(0x00000104)) ++ return (IPP2P_BIT * 100 + 53); ++ if (get_u32(haystack, 16) == __constant_htonl(0x00000406)) ++ return (IPP2P_BIT * 100 + 63); ++ break; ++ case 211: ++ if (get_u32(haystack, 8) == __constant_htonl(0x00000405)) ++ return (IPP2P_BIT * 100 + 54); ++ break; ++ case 29: ++ if ((get_u32(haystack, 8) == __constant_htonl(0x00000401))) ++ return (IPP2P_BIT * 100 + 55); ++ break; ++ case 52: ++ if (get_u32(haystack,8) == __constant_htonl(0x00000827) && ++ get_u32(haystack,12) == __constant_htonl(0x37502950)) ++ return (IPP2P_BIT * 100 + 80); ++ break; ++ default: ++ /* this packet does not have a constant size */ ++ if (packet_len >= 40 && get_u32(haystack, 16) == __constant_htonl(0x00000402) && get_u32(haystack, 36) == __constant_htonl(0x00000104)) ++ return (IPP2P_BIT * 100 + 56); ++ break; ++ } ++ ++ /* some extra-bitcomet rules: ++ * "d1:" [a|r] "d2:id20:" ++ */ ++ if (packet_len > 30 && get_u8(haystack, 8) == 'd' && get_u8(haystack, 9) == '1' && get_u8(haystack, 10) == ':' ) ++ { ++ if (get_u8(haystack, 11) == 'a' || get_u8(haystack, 11) == 'r') ++ { ++ if (memcmp(haystack+12,"d2:id20:",8)==0) ++ return (IPP2P_BIT * 100 + 57); ++ } ++ } ++ ++#if 0 ++ /* bitlord rules */ ++ /* packetlen must be bigger than 40 */ ++ /* first 4 bytes are zero */ ++ if (packet_len > 40 && get_u32(haystack, 8) == 0x00000000) ++ { ++ /* first rule: 00 00 00 00 01 00 00 xx xx xx xx 00 00 00 00*/ ++ if (get_u32(haystack, 12) == 0x00000000 && ++ get_u32(haystack, 16) == 0x00010000 && ++ get_u32(haystack, 24) == 0x00000000 ) ++ return (IPP2P_BIT * 100 + 71); ++ ++ /* 00 01 00 00 0d 00 00 xx xx xx xx 00 00 00 00*/ ++ if (get_u32(haystack, 12) == 0x00000001 && ++ get_u32(haystack, 16) == 0x000d0000 && ++ get_u32(haystack, 24) == 0x00000000 ) ++ return (IPP2P_BIT * 100 + 71); ++ ++ ++ } ++#endif ++ ++ return 0; ++}/*udp_search_bit*/ ++ ++ ++ ++/*Search for Ares commands*/ ++//#define IPP2P_DEBUG_ARES ++int ++search_ares (const unsigned char *payload, const u16 plen) ++//int search_ares (unsigned char *haystack, int packet_len, int head_len) ++{ ++// const unsigned char *t = haystack + head_len; ++ ++ /* all ares packets start with */ ++ if (payload[1] == 0 && (plen - payload[0]) == 3) ++ { ++ switch (payload[2]) ++ { ++ case 0x5a: ++ /* ares connect */ ++ if ( plen == 6 && payload[5] == 0x05 ) return ((IPP2P_ARES * 100) + 1); ++ break; ++ case 0x09: ++ /* ares search, min 3 chars --> 14 bytes ++ * lets define a search can be up to 30 chars --> max 34 bytes ++ */ ++ if ( plen >= 14 && plen <= 34 ) return ((IPP2P_ARES * 100) + 1); ++ break; ++#ifdef IPP2P_DEBUG_ARES ++ default: ++ printk(KERN_DEBUG "Unknown Ares command %x recognized, len: %u \n", (unsigned int) payload[2],plen); ++#endif /* IPP2P_DEBUG_ARES */ ++ } ++ } ++ ++#if 0 ++ /* found connect packet: 03 00 5a 04 03 05 */ ++ /* new version ares 1.8: 03 00 5a xx xx 05 */ ++ if ((plen) == 6){ /* possible connect command*/ ++ if ((payload[0] == 0x03) && (payload[1] == 0x00) && (payload[2] == 0x5a) && (payload[5] == 0x05)) ++ return ((IPP2P_ARES * 100) + 1); ++ } ++ if ((plen) == 60){ /* possible download command*/ ++ if ((payload[59] == 0x0a) && (payload[58] == 0x0a)){ ++ if (memcmp(t, "PUSH SHA1:", 10) == 0) /* found download command */ ++ return ((IPP2P_ARES * 100) + 2); ++ } ++ } ++#endif ++ ++ return 0; ++} /*search_ares*/ ++ ++/*Search for SoulSeek commands*/ ++int ++search_soul (const unsigned char *payload, const u16 plen) ++{ ++//#define IPP2P_DEBUG_SOUL ++ /* match: xx xx xx xx | xx = sizeof(payload) - 4 */ ++ if (get_u32(payload, 0) == (plen - 4)){ ++ const __u32 m=get_u32(payload, 4); ++ /* match 00 yy yy 00, yy can be everything */ ++ if ( get_u8(payload, 4) == 0x00 && get_u8(payload, 7) == 0x00 ) ++ { ++#ifdef IPP2P_DEBUG_SOUL ++ printk(KERN_DEBUG "0: Soulseek command 0x%x recognized\n",get_u32(payload, 4)); ++#endif /* IPP2P_DEBUG_SOUL */ ++ return ((IPP2P_SOUL * 100) + 1); ++ } ++ ++ /* next match: 01 yy 00 00 | yy can be everything */ ++ if ( get_u8(payload, 4) == 0x01 && get_u16(payload, 6) == 0x0000 ) ++ { ++#ifdef IPP2P_DEBUG_SOUL ++ printk(KERN_DEBUG "1: Soulseek command 0x%x recognized\n",get_u16(payload, 4)); ++#endif /* IPP2P_DEBUG_SOUL */ ++ return ((IPP2P_SOUL * 100) + 2); ++ } ++ ++ /* other soulseek commandos are: 1-5,7,9,13-18,22,23,26,28,35-37,40-46,50,51,60,62-69,91,92,1001 */ ++ /* try to do this in an intelligent way */ ++ /* get all small commandos */ ++ switch(m) ++ { ++ case 7: ++ case 9: ++ case 22: ++ case 23: ++ case 26: ++ case 28: ++ case 50: ++ case 51: ++ case 60: ++ case 91: ++ case 92: ++ case 1001: ++#ifdef IPP2P_DEBUG_SOUL ++ printk(KERN_DEBUG "2: Soulseek command 0x%x recognized\n",get_u16(payload, 4)); ++#endif /* IPP2P_DEBUG_SOUL */ ++ return ((IPP2P_SOUL * 100) + 3); ++ } ++ ++ if (m > 0 && m < 6 ) ++ { ++#ifdef IPP2P_DEBUG_SOUL ++ printk(KERN_DEBUG "3: Soulseek command 0x%x recognized\n",get_u16(payload, 4)); ++#endif /* IPP2P_DEBUG_SOUL */ ++ return ((IPP2P_SOUL * 100) + 4); ++ } ++ if (m > 12 && m < 19 ) ++ { ++#ifdef IPP2P_DEBUG_SOUL ++ printk(KERN_DEBUG "4: Soulseek command 0x%x recognized\n",get_u16(payload, 4)); ++#endif /* IPP2P_DEBUG_SOUL */ ++ return ((IPP2P_SOUL * 100) + 5); ++ } ++ ++ if (m > 34 && m < 38 ) ++ { ++#ifdef IPP2P_DEBUG_SOUL ++ printk(KERN_DEBUG "5: Soulseek command 0x%x recognized\n",get_u16(payload, 4)); ++#endif /* IPP2P_DEBUG_SOUL */ ++ return ((IPP2P_SOUL * 100) + 6); ++ } ++ ++ if (m > 39 && m < 47 ) ++ { ++#ifdef IPP2P_DEBUG_SOUL ++ printk(KERN_DEBUG "6: Soulseek command 0x%x recognized\n",get_u16(payload, 4)); ++#endif /* IPP2P_DEBUG_SOUL */ ++ return ((IPP2P_SOUL * 100) + 7); ++ } ++ ++ if (m > 61 && m < 70 ) ++ { ++#ifdef IPP2P_DEBUG_SOUL ++ printk(KERN_DEBUG "7: Soulseek command 0x%x recognized\n",get_u16(payload, 4)); ++#endif /* IPP2P_DEBUG_SOUL */ ++ return ((IPP2P_SOUL * 100) + 8); ++ } ++ ++#ifdef IPP2P_DEBUG_SOUL ++ printk(KERN_DEBUG "unknown SOULSEEK command: 0x%x, first 16 bit: 0x%x, first 8 bit: 0x%x ,soulseek ???\n",get_u32(payload, 4),get_u16(payload, 4) >> 16,get_u8(payload, 4) >> 24); ++#endif /* IPP2P_DEBUG_SOUL */ ++ } ++ ++ /* match 14 00 00 00 01 yy 00 00 00 STRING(YY) 01 00 00 00 00 46|50 00 00 00 00 */ ++ /* without size at the beginning !!! */ ++ if ( get_u32(payload, 0) == 0x14 && get_u8(payload, 4) == 0x01 ) ++ { ++ __u32 y=get_u32(payload, 5); ++ /* we need 19 chars + string */ ++ if ( (y + 19) <= (plen) ) ++ { ++ const unsigned char *w=payload+9+y; ++ if (get_u32(w, 0) == 0x01 && ( get_u16(w, 4) == 0x4600 || get_u16(w, 4) == 0x5000) && get_u32(w, 6) == 0x00); ++#ifdef IPP2P_DEBUG_SOUL ++ printk(KERN_DEBUG "Soulssek special client command recognized\n"); ++#endif /* IPP2P_DEBUG_SOUL */ ++ return ((IPP2P_SOUL * 100) + 9); ++ } ++ } ++ return 0; ++} ++ ++ ++/*Search for WinMX commands*/ ++int ++search_winmx (const unsigned char *payload, const u16 plen) ++{ ++//#define IPP2P_DEBUG_WINMX ++ if (((plen) == 4) && (memcmp(payload, "SEND", 4) == 0)) return ((IPP2P_WINMX * 100) + 1); ++ if (((plen) == 3) && (memcmp(payload, "GET", 3) == 0)) return ((IPP2P_WINMX * 100) + 2); ++ //if (packet_len < (head_len + 10)) return 0; ++ if (plen < 10) return 0; ++ ++ if ((memcmp(payload, "SEND", 4) == 0) || (memcmp(payload, "GET", 3) == 0)){ ++ u16 c=4; ++ const u16 end=plen-2; ++ u8 count=0; ++ while (c < end) ++ { ++ if (payload[c]== 0x20 && payload[c+1] == 0x22) ++ { ++ c++; ++ count++; ++ if (count>=2) return ((IPP2P_WINMX * 100) + 3); ++ } ++ c++; ++ } ++ } ++ ++ if ( plen == 149 && payload[0] == '8' ) ++ { ++#ifdef IPP2P_DEBUG_WINMX ++ printk(KERN_INFO "maybe WinMX\n"); ++#endif ++ if (get_u32(payload,17) == 0 && get_u32(payload,21) == 0 && get_u32(payload,25) == 0 && ++// get_u32(payload,33) == __constant_htonl(0x71182b1a) && get_u32(payload,37) == __constant_htonl(0x05050000) && ++// get_u32(payload,133) == __constant_htonl(0x31097edf) && get_u32(payload,145) == __constant_htonl(0xdcb8f792)) ++ get_u16(payload,39) == 0 && get_u16(payload,135) == __constant_htons(0x7edf) && get_u16(payload,147) == __constant_htons(0xf792)) ++ ++ { ++#ifdef IPP2P_DEBUG_WINMX ++ printk(KERN_INFO "got WinMX\n"); ++#endif ++ return ((IPP2P_WINMX * 100) + 4); ++ } ++ } ++ return 0; ++} /*search_winmx*/ ++ ++ ++/*Search for appleJuice commands*/ ++int ++search_apple (const unsigned char *payload, const u16 plen) ++{ ++ if ( (plen > 7) && (payload[6] == 0x0d) && (payload[7] == 0x0a) && (memcmp(payload, "ajprot", 6) == 0)) return (IPP2P_APPLE * 100); ++ ++ return 0; ++} ++ ++ ++/*Search for BitTorrent commands*/ ++int ++search_bittorrent (const unsigned char *payload, const u16 plen) ++{ ++ if (plen > 20) ++ { ++ /* test for match 0x13+"BitTorrent protocol" */ ++ if (payload[0] == 0x13) ++ { ++ if (memcmp(payload+1, "BitTorrent protocol", 19) == 0) return (IPP2P_BIT * 100); ++ } ++ ++ /* get tracker commandos, all starts with GET / ++ * then it can follow: scrape| announce ++ * and then ?hash_info= ++ */ ++ if (memcmp(payload,"GET /",5) == 0) ++ { ++ /* message scrape */ ++ if ( memcmp(payload+5,"scrape?info_hash=",17)==0 ) return (IPP2P_BIT * 100 + 1); ++ /* message announce */ ++ if ( memcmp(payload+5,"announce?info_hash=",19)==0 ) return (IPP2P_BIT * 100 + 2); ++ } ++ } ++ else ++ { ++ /* bitcomet encryptes the first packet, so we have to detect another ++ * one later in the flow */ ++ /* first try failed, too many missdetections */ ++ //if ( size == 5 && get_u32(t,0) == __constant_htonl(1) && t[4] < 3) return (IPP2P_BIT * 100 + 3); ++ ++ /* second try: block request packets */ ++ if ( plen == 17 && get_u32(payload,0) == __constant_htonl(0x0d) && payload[4] == 0x06 && get_u32(payload,13) == __constant_htonl(0x4000) ) return (IPP2P_BIT * 100 + 3); ++ } ++ ++ return 0; ++} ++ ++ ++ ++/*check for Kazaa get command*/ ++int ++search_kazaa (const unsigned char *payload, const u16 plen) ++ ++{ ++ if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a) && memcmp(payload, "GET /.hash=", 11) == 0) ++ return (IPP2P_DATA_KAZAA * 100); ++ ++ return 0; ++} ++ ++ ++/*check for gnutella get command*/ ++int ++search_gnu (const unsigned char *payload, const u16 plen) ++{ ++ if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a)) ++ { ++ if (memcmp(payload, "GET /get/", 9) == 0) return ((IPP2P_DATA_GNU * 100) + 1); ++ if (memcmp(payload, "GET /uri-res/", 13) == 0) return ((IPP2P_DATA_GNU * 100) + 2); ++ } ++ return 0; ++} ++ ++ ++/*check for gnutella get commands and other typical data*/ ++int ++search_all_gnu (const unsigned char *payload, const u16 plen) ++{ ++ ++ if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a)) ++ { ++ ++ if (memcmp(payload, "GNUTELLA CONNECT/", 17) == 0) return ((IPP2P_GNU * 100) + 1); ++ if (memcmp(payload, "GNUTELLA/", 9) == 0) return ((IPP2P_GNU * 100) + 2); ++ ++ ++ if ((memcmp(payload, "GET /get/", 9) == 0) || (memcmp(payload, "GET /uri-res/", 13) == 0)) ++ { ++ u16 c=8; ++ const u16 end=plen-22; ++ while (c < end) { ++ if ( payload[c] == 0x0a && payload[c+1] == 0x0d && ((memcmp(&payload[c+2], "X-Gnutella-", 11) == 0) || (memcmp(&payload[c+2], "X-Queue:", 8) == 0))) ++ return ((IPP2P_GNU * 100) + 3); ++ c++; ++ } ++ } ++ } ++ return 0; ++} ++ ++ ++/*check for KaZaA download commands and other typical data*/ ++int ++search_all_kazaa (const unsigned char *payload, const u16 plen) ++{ ++ if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a)) ++ { ++ ++ if (memcmp(payload, "GIVE ", 5) == 0) return ((IPP2P_KAZAA * 100) + 1); ++ ++ if (memcmp(payload, "GET /", 5) == 0) { ++ u16 c = 8; ++ const u16 end=plen-22; ++ while (c < end) { ++ if ( payload[c] == 0x0a && payload[c+1] == 0x0d && ((memcmp(&payload[c+2], "X-Kazaa-Username: ", 18) == 0) || (memcmp(&payload[c+2], "User-Agent: PeerEnabler/", 24) == 0))) ++ return ((IPP2P_KAZAA * 100) + 2); ++ c++; ++ } ++ } ++ } ++ return 0; ++} ++ ++/*fast check for edonkey file segment transfer command*/ ++int ++search_edk (const unsigned char *payload, const u16 plen) ++{ ++ if (payload[0] != 0xe3) ++ return 0; ++ else { ++ if (payload[5] == 0x47) ++ return (IPP2P_DATA_EDK * 100); ++ else ++ return 0; ++ } ++} ++ ++ ++ ++/*intensive but slower search for some edonkey packets including size-check*/ ++int ++search_all_edk (const unsigned char *payload, const u16 plen) ++{ ++ if (payload[0] != 0xe3) ++ return 0; ++ else { ++ //t += head_len; ++ const u16 cmd = get_u16(payload, 1); ++ if (cmd == (plen - 5)) { ++ switch (payload[5]) { ++ case 0x01: return ((IPP2P_EDK * 100) + 1); /*Client: hello or Server:hello*/ ++ case 0x4c: return ((IPP2P_EDK * 100) + 9); /*Client: Hello-Answer*/ ++ } ++ } ++ return 0; ++ } ++} ++ ++ ++/*fast check for Direct Connect send command*/ ++int ++search_dc (const unsigned char *payload, const u16 plen) ++{ ++ ++ if (payload[0] != 0x24 ) ++ return 0; ++ else { ++ if (memcmp(&payload[1], "Send|", 5) == 0) ++ return (IPP2P_DATA_DC * 100); ++ else ++ return 0; ++ } ++ ++} ++ ++ ++/*intensive but slower check for all direct connect packets*/ ++int ++search_all_dc (const unsigned char *payload, const u16 plen) ++{ ++// unsigned char *t = haystack; ++ ++ if (payload[0] == 0x24 && payload[plen-1] == 0x7c) ++ { ++ const unsigned char *t=&payload[1]; ++ /* Client-Hub-Protocol */ ++ if (memcmp(t, "Lock ", 5) == 0) return ((IPP2P_DC * 100) + 1); ++ /* Client-Client-Protocol, some are already recognized by client-hub (like lock) */ ++ if (memcmp(t, "MyNick ", 7) == 0) return ((IPP2P_DC * 100) + 38); ++ } ++ return 0; ++} ++ ++/*check for mute*/ ++int ++search_mute (const unsigned char *payload, const u16 plen) ++{ ++ if ( plen == 209 || plen == 345 || plen == 473 || plen == 609 || plen == 1121 ) ++ { ++ //printk(KERN_DEBUG "size hit: %u",size); ++ if (memcmp(payload,"PublicKey: ",11) == 0 ) ++ { ++ return ((IPP2P_MUTE * 100) + 0); ++ ++/* if (memcmp(t+size-14,"\x0aEndPublicKey\x0a",14) == 0) ++ { ++ printk(KERN_DEBUG "end pubic key hit: %u",size); ++ ++ }*/ ++ } ++ } ++ return 0; ++} ++ ++ ++/* check for xdcc */ ++int ++search_xdcc (const unsigned char *payload, const u16 plen) ++{ ++ /* search in small packets only */ ++ if (plen > 20 && plen < 200 && payload[plen-1] == 0x0a && payload[plen-2] == 0x0d && memcmp(payload,"PRIVMSG ",8) == 0) ++ { ++ ++ u16 x=10; ++ const u16 end=plen - 13; ++ ++ /* is seems to be a irc private massage, chedck for xdcc command */ ++ while (x < end) ++ { ++ if (payload[x] == ':') ++ { ++ if ( memcmp(&payload[x+1],"xdcc send #",11) == 0 ) ++ return ((IPP2P_XDCC * 100) + 0); ++ } ++ x++; ++ } ++ } ++ return 0; ++} ++ ++/* search for waste */ ++int search_waste(const unsigned char *payload, const u16 plen) ++{ ++ if ( plen >= 8 && memcmp(payload,"GET.sha1:",9) == 0) ++ return ((IPP2P_WASTE * 100) + 0); ++ ++ return 0; ++} ++ ++ ++static struct { ++ int command; ++ __u8 short_hand; /*for fucntions included in short hands*/ ++ int packet_len; ++ int (*function_name) (const unsigned char *, const u16); ++} matchlist[] = { ++ {IPP2P_EDK,SHORT_HAND_IPP2P,20, &search_all_edk}, ++// {IPP2P_DATA_KAZAA,SHORT_HAND_DATA,200, &search_kazaa}, ++// {IPP2P_DATA_EDK,SHORT_HAND_DATA,60, &search_edk}, ++// {IPP2P_DATA_DC,SHORT_HAND_DATA,26, &search_dc}, ++ {IPP2P_DC,SHORT_HAND_IPP2P,5, search_all_dc}, ++// {IPP2P_DATA_GNU,SHORT_HAND_DATA,40, &search_gnu}, ++ {IPP2P_GNU,SHORT_HAND_IPP2P,5, &search_all_gnu}, ++ {IPP2P_KAZAA,SHORT_HAND_IPP2P,5, &search_all_kazaa}, ++ {IPP2P_BIT,SHORT_HAND_IPP2P,20, &search_bittorrent}, ++ {IPP2P_APPLE,SHORT_HAND_IPP2P,5, &search_apple}, ++ {IPP2P_SOUL,SHORT_HAND_IPP2P,5, &search_soul}, ++ {IPP2P_WINMX,SHORT_HAND_IPP2P,2, &search_winmx}, ++ {IPP2P_ARES,SHORT_HAND_IPP2P,5, &search_ares}, ++ {IPP2P_MUTE,SHORT_HAND_NONE,200, &search_mute}, ++ {IPP2P_WASTE,SHORT_HAND_NONE,5, &search_waste}, ++ {IPP2P_XDCC,SHORT_HAND_NONE,5, &search_xdcc}, ++ {0,0,0,NULL} ++}; ++ ++ ++static struct { ++ int command; ++ __u8 short_hand; /*for fucntions included in short hands*/ ++ int packet_len; ++ int (*function_name) (unsigned char *, int); ++} udp_list[] = { ++ { IPP2P_KAZAA, SHORT_HAND_IPP2P, 14, &udp_search_kazaa}, ++ { IPP2P_BIT, SHORT_HAND_IPP2P, 23, &udp_search_bit}, ++ { IPP2P_GNU, SHORT_HAND_IPP2P, 11, &udp_search_gnu}, ++ { IPP2P_EDK, SHORT_HAND_IPP2P, 9, &udp_search_edk}, ++ { IPP2P_DC, SHORT_HAND_IPP2P, 12, &udp_search_directconnect}, ++ { 0, 0, 0, NULL } ++}; ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) ++static bool ++#else ++static int ++#endif ++match(const struct sk_buff *skb, ++ const struct net_device *in, ++ const struct net_device *out, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) ++ const struct xt_match *match, ++#endif ++ const void *matchinfo, ++ int offset, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) ++ const void *hdr, ++ u_int16_t datalen, ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) ++ unsigned int protoff, ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) ++ bool *hotdrop) ++#else ++ bool *hotdrop) ++#endif ++{ ++ const struct ipt_p2p_info *info = matchinfo; ++ unsigned char *haystack; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) ++ struct iphdr *ip = ip_hdr(skb); ++#else ++ struct iphdr *ip = skb->nh.iph; ++#endif ++ int p2p_result = 0, i = 0; ++// int head_len; ++ int hlen = ntohs(ip->tot_len)-(ip->ihl*4); /*hlen = packet-data length*/ ++ ++ /*must not be a fragment*/ ++ if (offset) { ++ if (info->debug) printk("IPP2P.match: offset found %i \n",offset); ++ return 0; ++ } ++ ++ /*make sure that skb is linear*/ ++ if(skb_is_nonlinear(skb)){ ++ if (info->debug) printk("IPP2P.match: nonlinear skb found\n"); ++ return 0; ++ } ++ ++ ++ haystack=(char *)ip+(ip->ihl*4); /*haystack = packet data*/ ++ ++ switch (ip->protocol){ ++ case IPPROTO_TCP: /*what to do with a TCP packet*/ ++ { ++ struct tcphdr *tcph = (void *) ip + ip->ihl * 4; ++ ++ if (tcph->fin) return 0; /*if FIN bit is set bail out*/ ++ if (tcph->syn) return 0; /*if SYN bit is set bail out*/ ++ if (tcph->rst) return 0; /*if RST bit is set bail out*/ ++ ++ haystack += tcph->doff * 4; /*get TCP-Header-Size*/ ++ hlen -= tcph->doff * 4; ++ while (matchlist[i].command) { ++ if ((((info->cmd & matchlist[i].command) == matchlist[i].command) || ++ ((info->cmd & matchlist[i].short_hand) == matchlist[i].short_hand)) && ++ (hlen > matchlist[i].packet_len)) { ++ p2p_result = matchlist[i].function_name(haystack, hlen); ++ if (p2p_result) ++ { ++ if (info->debug) printk("IPP2P.debug:TCP-match: %i from: %u.%u.%u.%u:%i to: %u.%u.%u.%u:%i Length: %i\n", ++ p2p_result, NIPQUAD(ip->saddr),ntohs(tcph->source), NIPQUAD(ip->daddr),ntohs(tcph->dest),hlen); ++ return p2p_result; ++ } ++ } ++ i++; ++ } ++ return p2p_result; ++ } ++ ++ case IPPROTO_UDP: /*what to do with an UDP packet*/ ++ { ++ struct udphdr *udph = (void *) ip + ip->ihl * 4; ++ ++ while (udp_list[i].command){ ++ if ((((info->cmd & udp_list[i].command) == udp_list[i].command) || ++ ((info->cmd & udp_list[i].short_hand) == udp_list[i].short_hand)) && ++ (hlen > udp_list[i].packet_len)) { ++ p2p_result = udp_list[i].function_name(haystack, hlen); ++ if (p2p_result){ ++ if (info->debug) printk("IPP2P.debug:UDP-match: %i from: %u.%u.%u.%u:%i to: %u.%u.%u.%u:%i Length: %i\n", ++ p2p_result, NIPQUAD(ip->saddr),ntohs(udph->source), NIPQUAD(ip->daddr),ntohs(udph->dest),hlen); ++ return p2p_result; ++ } ++ } ++ i++; ++ } ++ return p2p_result; ++ } ++ ++ default: return 0; ++ } ++} ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) ++static bool ++#else ++static int ++#endif ++checkentry(const char *tablename, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) ++ const void *ip, ++#else ++ const struct ipt_ip *ip, ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) ++ const struct xt_match *match, ++#endif ++ void *matchinfo, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) ++ unsigned int matchsize, ++#endif ++ unsigned int hook_mask) ++{ ++ /* Must specify -p tcp */ ++/* if (ip->proto != IPPROTO_TCP || (ip->invflags & IPT_INV_PROTO)) { ++ * printk("ipp2p: Only works on TCP packets, use -p tcp\n"); ++ * return 0; ++ * }*/ ++ return 1; ++} ++ ++ ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) ++static struct xt_match ipp2p_match = { ++#else ++static struct ipt_match ipp2p_match = { ++#endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) ++ { NULL, NULL }, ++ "ipp2p", ++ &ipp2p_match, ++ &ipp2p_checkentry, ++ NULL, ++ THIS_MODULE ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++ .name = "ipp2p", ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) ++ .family = AF_INET, ++#endif ++ .match = &match, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) ++ .matchsize = sizeof(struct ipt_p2p_info), ++#endif ++ .checkentry = &checkentry, ++ .me = THIS_MODULE, ++#endif ++}; ++ ++ ++static int __init init(void) ++{ ++ printk(KERN_INFO "IPP2P v%s loading\n", IPP2P_VERSION); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) ++ return xt_register_match(&ipp2p_match); ++#else ++ return ipt_register_match(&ipp2p_match); ++#endif ++} ++ ++static void __exit fini(void) ++{ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) ++ xt_unregister_match(&ipp2p_match); ++#else ++ ipt_unregister_match(&ipp2p_match); ++#endif ++ printk(KERN_INFO "IPP2P v%s unloaded\n", IPP2P_VERSION); ++} ++ ++module_init(init); ++module_exit(fini); ++ ++ +diff -Naur linux-2.6.27.19.org/net/ipv4/netfilter/Kconfig linux-2.6.27.19/net/ipv4/netfilter/Kconfig +--- linux-2.6.27.19.org/net/ipv4/netfilter/Kconfig 2009-02-20 23:39:34.000000000 +0100 ++++ linux-2.6.27.19/net/ipv4/netfilter/Kconfig 2009-03-17 19:31:50.000000000 +0100 +@@ -406,5 +406,15 @@ + Allows altering the ARP packet payload: source and destination + hardware and network addresses. + ++config IP_NF_MATCH_IPP2P ++ tristate 'IPP2P match support' ++ depends on IP_NF_IPTABLES ++ help ++ This option makes possible to match some P2P packets ++ therefore helps controlling such traffic. ++ ++ If you want to compile it as a module, say M here and read ++ . If unsure, say `N'. ++ + endmenu + +diff -Naur linux-2.6.27.19.org/net/ipv4/netfilter/Makefile linux-2.6.27.19/net/ipv4/netfilter/Makefile +--- linux-2.6.27.19.org/net/ipv4/netfilter/Makefile 2009-02-20 23:39:34.000000000 +0100 ++++ linux-2.6.27.19/net/ipv4/netfilter/Makefile 2009-03-17 19:31:50.000000000 +0100 +@@ -49,6 +49,7 @@ + obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o + obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o + obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o ++obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o + obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o + + # targets -- 2.39.2