From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. 3e011c27dde3276f23cda5197f18144bba078173 Date: Sun, 10 Jun 2012 18:44:03 +0200 Message-ID: <20120610164418.1DAFD20145@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4188210553357942686==" List-Id: --===============4188210553357942686== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, kernel-update has been updated via 3e011c27dde3276f23cda5197f18144bba078173 (commit) via 1f6abd5362d74f585bdaf26bd9dea71905130e7c (commit) via fddc02a51a9b1c484a6e3c2073adf22dbba8bbac (commit) via e516f073d61d528068aa138665ab5c7a03b11165 (commit) via 15eb7e0a7f984482b8a8ec58131c8797dfe7537a (commit) via a832f4f33ef12cd4245b5d50bc98b05db2dae2ca (commit) via 3648650e7628193cf271c984e7fcafa7dd59fe04 (commit) via 1346863ac7cbf67b38d6209a6b0ab3bab565386c (commit) via 6105282debd636dd5634f6e487afbeb02b51a69b (commit) via e70bd5b7423a0e29248d0084fd04973c06ae8202 (commit) via e98e3852ca6bdb6975f5faa4267541054d21033c (commit) via 8e148dc343c0a313568cc8a8c140090f93817b23 (commit) via aa7afd463d24edbefe34f6f57a39345777cb89e2 (commit) via 7b82e244887c5803ab333c1dac3fcba03044ab05 (commit) via 4bd2536f4b2da867a96c53b79320874793231002 (commit) via a18da317d3b9802572f2f174d1b76a1eba7ff53b (commit) via c7c8b4aaecc68b12fa3ad89d2eabe82581b969ad (commit) via db083dd81ece9a52f1badc189d34f89b228a28c0 (commit) via 58574e318b594d471a6c9376ade91d7f7c6f4644 (commit) via dc7239d678ca426485814c95060ac72d987b814d (commit) via 8074eed711092b90ae279fa968545a27d2655fd6 (commit) via 68eeed828507c6edc395772d6d9c81f1cc12dd53 (commit) via d66d6f88273637d34b649184543862f588a7d9e3 (commit) via 36585d00bd91bb7207627ca4e46c5d3c6f20cd26 (commit) via 8f6a5178e816689fc6bd38aebfc0cfc41aa5d37d (commit) via 54798036675c0eebb8dedb55d2e509d8385cc363 (commit) via a6f4183e83385cbd21d31db07171fb7109b81d54 (commit) via 75c2cf6f51d4f7d8e513b6df6a25b30e8a834f9f (commit) from 9007007b4ef870fbc115851d7bd53dff771e9415 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3e011c27dde3276f23cda5197f18144bba078173 Author: Arne Fitzenreiter Date: Sun Jun 10 11:16:57 2012 +0200 flashimages: switch to single ext4 (wo journal) =20 also support video out on pandaboard. commit 1f6abd5362d74f585bdaf26bd9dea71905130e7c Author: Arne Fitzenreiter Date: Sun Jun 10 11:13:59 2012 +0200 kernel: updated omap and rpi kernel to 2.6.42.19 (aka 3.2.19). commit fddc02a51a9b1c484a6e3c2073adf22dbba8bbac Merge: 9007007 e516f07 Author: Arne Fitzenreiter Date: Sat Jun 2 10:25:02 2012 +0200 Merge remote-tracking branch 'origin/next' into kernel-update ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.armv5tel-ipfire-omap | 647 ++++++++++++------= -- config/kernel/kernel.config.armv5tel-ipfire-rpi | 475 +++++++++------ config/rootfiles/common/armv5tel/linux-omap | 6 +- config/rootfiles/common/armv5tel/linux-rpi | 6 +- config/rootfiles/core/59/update.sh | 4 + config/rootfiles/core/{55 =3D> 60}/exclude | 0 config/rootfiles/core/{55 =3D> 60}/filelists/files | 0 .../rootfiles/core/{53 =3D> 60}/filelists/strongswan | 0 config/rootfiles/core/{52 =3D> 60}/meta | 0 config/rootfiles/core/{59 =3D> 60}/update.sh | 7 +- config/rootfiles/core/{55 =3D> 61}/exclude | 0 config/rootfiles/core/{54 =3D> 61}/filelists/GeoIP | 0 .../rootfiles/core/{58 =3D> 61}/filelists/Net-Telnet | 0 config/rootfiles/core/{58 =3D> 61}/filelists/files | 2 +- config/rootfiles/core/{52 =3D> 61}/meta | 0 config/rootfiles/core/{59 =3D> 61}/update.sh | 6 +- config/rootfiles/packages/mtr | 2 + config/rootfiles/packages/tcpick | 3 + config/u-boot/boot.scr | Bin 300 -> 322 bytes config/u-boot/boot.script | 2 +- html/cgi-bin/index.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 4 + langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 4 + langs/es/cgi-bin/es.pl | 4 + langs/fr/cgi-bin/fr.pl | 4 + langs/pl/cgi-bin/pl.pl | 4 + langs/ru/cgi-bin/ru.pl | 4 + lfs/flash-images | 54 +- lfs/linux-rpi | 264 -------- lfs/linux3 | 56 +- lfs/{joe =3D> mtr} | 9 +- lfs/strongswan | 4 +- lfs/{iftop =3D> tcpick} | 8 +- make.sh | 8 +- src/initscripts/init.d/collectd | 11 +- src/initscripts/init.d/fsresize | 25 +- src/initscripts/init.d/partresize | 8 +- src/patches/linux-2.6.40-pandaboard-dvi720p.patch | 51 -- src/patches/linux-2.6.40-pandaboard-i2c-fix.patch | 22 - src/patches/linux-2.6.40-pandaboard-memcpy.patch | 21 - .../linux-2.6.40-pandaboard-rtc-twl-irq.patch | 27 - src/patches/linux-2.6.40-pandaboard-wlan-fix.patch | 12 - src/patches/linux-3.2-0001-panda-wlan-fix.patch | 12 + src/patches/linux-3.2-0002-panda-i2c.patch | 51 ++ src/patches/linux-3.2-bcm2835-alsamixer.patch | 48 ++ src/patches/linux-3.2-bcm2835-limit_volume.patch | 12 + .../{linux-3.1-imq.patch =3D> linux-3.2-imq.patch} | 166 +++--- ...d-reboot.patch =3D> linux-3.2-panda-reboot.patch} | 0 49 files changed, 1015 insertions(+), 1042 deletions(-) copy config/rootfiles/core/{55 =3D> 60}/exclude (100%) copy config/rootfiles/core/{55 =3D> 60}/filelists/files (100%) copy config/rootfiles/core/{53 =3D> 60}/filelists/strongswan (100%) copy config/rootfiles/core/{52 =3D> 60}/meta (100%) copy config/rootfiles/core/{59 =3D> 60}/update.sh (96%) copy config/rootfiles/core/{55 =3D> 61}/exclude (100%) copy config/rootfiles/core/{54 =3D> 61}/filelists/GeoIP (100%) copy config/rootfiles/core/{58 =3D> 61}/filelists/Net-Telnet (100%) copy config/rootfiles/core/{58 =3D> 61}/filelists/files (85%) copy config/rootfiles/core/{52 =3D> 61}/meta (100%) copy config/rootfiles/core/{59 =3D> 61}/update.sh (96%) create mode 100644 config/rootfiles/packages/mtr create mode 100644 config/rootfiles/packages/tcpick delete mode 100644 lfs/linux-rpi copy lfs/{joe =3D> mtr} (96%) copy lfs/{iftop =3D> tcpick} (96%) delete mode 100755 src/patches/linux-2.6.40-pandaboard-dvi720p.patch delete mode 100755 src/patches/linux-2.6.40-pandaboard-i2c-fix.patch delete mode 100644 src/patches/linux-2.6.40-pandaboard-memcpy.patch delete mode 100644 src/patches/linux-2.6.40-pandaboard-rtc-twl-irq.patch delete mode 100755 src/patches/linux-2.6.40-pandaboard-wlan-fix.patch mode change 100755 =3D> 100644 src/patches/linux-2.x-smsc95xx-add_mac_addr_p= aram.patch create mode 100644 src/patches/linux-3.2-0001-panda-wlan-fix.patch create mode 100644 src/patches/linux-3.2-0002-panda-i2c.patch create mode 100644 src/patches/linux-3.2-bcm2835-alsamixer.patch create mode 100644 src/patches/linux-3.2-bcm2835-limit_volume.patch copy src/patches/{linux-3.1-imq.patch =3D> linux-3.2-imq.patch} (90%) rename src/patches/{linux-2.6.40-pandaboard-reboot.patch =3D> linux-3.2-pand= a-reboot.patch} (100%) Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-omap b/config/kernel= /kernel.config.armv5tel-ipfire-omap index 5680114..eb8c18a 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-omap +++ b/config/kernel/kernel.config.armv5tel-ipfire-omap @@ -1,6 +1,6 @@ # -# Automatically generated make config: don't edit -# Linux/arm 2.6.40.26-ipfire-omap Kernel Configuration +# Automatically generated file; DO NOT EDIT. +# Linux/arm 2.6.42.19-ipfire-omap Kernel Configuration # CONFIG_ARM=3Dy CONFIG_HAVE_PWM=3Dy @@ -25,6 +25,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=3Dy CONFIG_NEED_DMA_MAP_STATE=3Dy CONFIG_VECTORS_BASE=3D0xffff0000 CONFIG_ARM_PATCH_PHYS_VIRT=3Dy +CONFIG_GENERIC_BUG=3Dy CONFIG_DEFCONFIG_LIST=3D"/lib/modules/$UNAME_RELEASE/.config" CONFIG_HAVE_IRQ_WORK=3Dy =20 @@ -62,6 +63,7 @@ CONFIG_GENERIC_HARDIRQS=3Dy CONFIG_HAVE_SPARSE_IRQ=3Dy CONFIG_GENERIC_IRQ_SHOW=3Dy CONFIG_GENERIC_IRQ_CHIP=3Dy +CONFIG_IRQ_DOMAIN=3Dy CONFIG_SPARSE_IRQ=3Dy =20 # @@ -94,7 +96,7 @@ CONFIG_RD_BZIP2=3Dy CONFIG_RD_LZMA=3Dy CONFIG_RD_XZ=3Dy CONFIG_RD_LZO=3Dy -CONFIG_CC_OPTIMIZE_FOR_SIZE=3Dy +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=3Dy CONFIG_ANON_INODES=3Dy CONFIG_EXPERT=3Dy @@ -156,6 +158,7 @@ CONFIG_STOP_MACHINE=3Dy CONFIG_BLOCK=3Dy CONFIG_LBDAF=3Dy CONFIG_BLK_DEV_BSG=3Dy +CONFIG_BLK_DEV_BSGLIB=3Dy # CONFIG_BLK_DEV_INTEGRITY is not set =20 # @@ -210,9 +213,11 @@ CONFIG_MMU=3Dy # CONFIG_ARCH_VEXPRESS is not set # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CNS3XXX is not set # CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_PRIMA2 is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set @@ -228,15 +233,14 @@ CONFIG_MMU=3Dy # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_KIRKWOOD is not set -# CONFIG_ARCH_LOKI is not set # CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_MV78XX0 is not set # CONFIG_ARCH_ORION5X is not set # CONFIG_ARCH_MMP is not set # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_NUC93X is not set # CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_PICOXCELL is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_MSM is not set @@ -248,7 +252,7 @@ CONFIG_MMU=3Dy # CONFIG_ARCH_S5P64X0 is not set # CONFIG_ARCH_S5PC100 is not set # CONFIG_ARCH_S5PV210 is not set -# CONFIG_ARCH_EXYNOS4 is not set +# CONFIG_ARCH_EXYNOS is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_TCC_926 is not set # CONFIG_ARCH_U300 is not set @@ -258,6 +262,7 @@ CONFIG_MMU=3Dy CONFIG_ARCH_OMAP=3Dy # CONFIG_PLAT_SPEAR is not set # CONFIG_ARCH_VT8500 is not set +# CONFIG_ARCH_ZYNQ is not set # CONFIG_GPIO_PCA953X is not set # CONFIG_KEYBOARD_GPIO_POLLED is not set =20 @@ -284,7 +289,6 @@ CONFIG_OMAP_32K_TIMER=3Dy # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set CONFIG_OMAP_32K_TIMER_HZ=3D128 CONFIG_OMAP_DM_TIMER=3Dy -# CONFIG_OMAP_PM_NONE is not set CONFIG_OMAP_PM_NOOP=3Dy CONFIG_MACH_OMAP_GENERIC=3Dy =20 @@ -336,6 +340,7 @@ CONFIG_MACH_OMAP_ZOOM2=3Dy CONFIG_MACH_OMAP_ZOOM3=3Dy CONFIG_MACH_CM_T35=3Dy CONFIG_MACH_CM_T3517=3Dy +CONFIG_MACH_CM_T3730=3Dy CONFIG_MACH_IGEP0020=3Dy CONFIG_MACH_IGEP0030=3Dy CONFIG_MACH_SBC3530=3Dy @@ -386,6 +391,7 @@ CONFIG_OUTER_CACHE_SYNC=3Dy CONFIG_CACHE_L2X0=3Dy CONFIG_ARM_L1_CACHE_SHIFT=3D5 CONFIG_ARM_DMA_MEM_BUFFERABLE=3Dy +# CONFIG_ARM_ERRATA_326103 is not set CONFIG_ARM_ERRATA_411920=3Dy CONFIG_ARM_ERRATA_430973=3Dy CONFIG_ARM_ERRATA_458693=3Dy @@ -399,6 +405,8 @@ CONFIG_ARM_ERRATA_743622=3Dy # CONFIG_ARM_ERRATA_751472 is not set CONFIG_ARM_ERRATA_754322=3Dy CONFIG_ARM_ERRATA_754327=3Dy +CONFIG_ARM_ERRATA_764369=3Dy +CONFIG_PL310_ERRATA_769419=3Dy CONFIG_ARM_GIC=3Dy =20 # @@ -407,8 +415,6 @@ CONFIG_ARM_GIC=3Dy # CONFIG_PCI_SYSCALL is not set # CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_PCCARD is not set -CONFIG_ARM_ERRATA_764369=3Dy -CONFIG_PL310_ERRATA_769419=3Dy =20 # # Kernel Features @@ -419,6 +425,9 @@ CONFIG_HIGH_RES_TIMERS=3Dy CONFIG_GENERIC_CLOCKEVENTS_BUILD=3Dy CONFIG_SMP=3Dy CONFIG_SMP_ON_UP=3Dy +CONFIG_ARM_CPU_TOPOLOGY=3Dy +CONFIG_SCHED_MC=3Dy +CONFIG_SCHED_SMT=3Dy CONFIG_HAVE_ARM_SCU=3Dy CONFIG_HAVE_ARM_TWD=3Dy CONFIG_VMSPLIT_3G=3Dy @@ -469,6 +478,7 @@ CONFIG_UACCESS_WITH_MEMCPY=3Dy CONFIG_USE_OF=3Dy CONFIG_ZBOOT_ROM_TEXT=3D0x0 CONFIG_ZBOOT_ROM_BSS=3D0x0 +# CONFIG_ARM_APPENDED_DTB is not set CONFIG_CMDLINE=3D"" # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set @@ -520,8 +530,10 @@ CONFIG_PM=3Dy # CONFIG_APM_EMULATION is not set CONFIG_ARCH_HAS_OPP=3Dy CONFIG_PM_OPP=3Dy -CONFIG_PM_RUNTIME_CLK=3Dy +CONFIG_PM_CLK=3Dy +CONFIG_CPU_PM=3Dy CONFIG_ARCH_SUSPEND_POSSIBLE=3Dy +CONFIG_ARM_CPU_SUSPEND=3Dy CONFIG_NET=3Dy =20 # @@ -727,6 +739,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=3Dm CONFIG_IP_SET_HASH_IPPORTNET=3Dm CONFIG_IP_SET_HASH_NET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm +CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm CONFIG_IP_VS=3Dm CONFIG_IP_VS_IPV6=3Dy @@ -887,6 +900,7 @@ CONFIG_LLC=3Dm # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set CONFIG_IEEE802154=3Dm +CONFIG_IEEE802154_6LOWPAN=3Dm CONFIG_NET_SCHED=3Dy =20 # @@ -1067,6 +1081,8 @@ CONFIG_CAIF=3Dm CONFIG_CAIF_NETDEV=3Dm CONFIG_CEPH_LIB=3Dm # CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +# CONFIG_NFC is not set =20 # # Device Drivers @@ -1085,13 +1101,14 @@ CONFIG_EXTRA_FIRMWARE=3D"" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set +CONFIG_REGMAP=3Dy +CONFIG_REGMAP_I2C=3Dm CONFIG_CONNECTOR=3Dm CONFIG_MTD=3Dm -# CONFIG_MTD_DEBUG is not set CONFIG_MTD_TESTS=3Dm # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_AFS_PARTS is not set -CONFIG_MTD_OF_PARTS=3Dy +CONFIG_MTD_OF_PARTS=3Dm CONFIG_MTD_AR7_PARTS=3Dm =20 # @@ -1151,6 +1168,7 @@ CONFIG_MTD_PHYSMAP=3Dm # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_DOCG3 is not set CONFIG_MTD_NAND_ECC=3Dm # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND is not set @@ -1191,6 +1209,7 @@ CONFIG_PARPORT_NOT_PC=3Dy CONFIG_BLK_DEV=3Dy # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=3Dy +CONFIG_BLK_DEV_LOOP_MIN_COUNT=3D8 CONFIG_BLK_DEV_CRYPTOLOOP=3Dm # CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_NBD=3Dm @@ -1207,7 +1226,7 @@ CONFIG_MG_DISK_RES=3D0 # CONFIG_SENSORS_LIS3LV02D is not set CONFIG_MISC_DEVICES=3Dy # CONFIG_AD525X_DPOT is not set -# CONFIG_INTEL_MID_PTI is not set +# CONFIG_ATMEL_PWM is not set CONFIG_ICS932S401=3Dm CONFIG_ENCLOSURE_SERVICES=3Dm # CONFIG_APDS9802ALS is not set @@ -1220,6 +1239,7 @@ CONFIG_SENSORS_TSL2550=3Dm # CONFIG_HMC6352 is not set CONFIG_DS1682=3Dm # CONFIG_BMP085 is not set +# CONFIG_USB_SWITCH_FSA9480 is not set CONFIG_C2PORT=3Dm =20 # @@ -1238,8 +1258,11 @@ CONFIG_IWMC3200TOP=3Dm # CONFIG_TI_ST=3Dm # CONFIG_SENSORS_LIS3_I2C is not set -CONFIG_HAVE_IDE=3Dy -# CONFIG_IDE is not set + +# +# Altera FPGA firmware download module +# +# CONFIG_ALTERA_STAPL is not set =20 # # SCSI device support @@ -1322,6 +1345,7 @@ CONFIG_PATA_ARASAN_CF=3Dm # PIO-only SFF controllers # CONFIG_PATA_PLATFORM=3Dm +CONFIG_PATA_OF_PLATFORM=3Dm =20 # # Generic fallback / legacy drivers @@ -1338,8 +1362,13 @@ CONFIG_MD_MULTIPATH=3Dm # CONFIG_MD_FAULTY is not set CONFIG_BLK_DEV_DM=3Dm # CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=3Dm +CONFIG_DM_PERSISTENT_DATA=3Dm CONFIG_DM_CRYPT=3Dm CONFIG_DM_SNAPSHOT=3Dm +CONFIG_DM_THIN_PROVISIONING=3Dm +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +# CONFIG_DM_DEBUG_SPACE_MAPS is not set CONFIG_DM_MIRROR=3Dm CONFIG_DM_RAID=3Dm CONFIG_DM_LOG_USERSPACE=3Dm @@ -1352,11 +1381,9 @@ CONFIG_DM_UEVENT=3Dy CONFIG_DM_FLAKEY=3Dm # CONFIG_TARGET_CORE is not set CONFIG_NETDEVICES=3Dy -CONFIG_IFB=3Dm -CONFIG_DUMMY=3Dm +CONFIG_NET_CORE=3Dy CONFIG_BONDING=3Dm -CONFIG_MACVLAN=3Dm -CONFIG_MACVTAP=3Dm +CONFIG_DUMMY=3Dm CONFIG_EQUALIZER=3Dm CONFIG_IMQ=3Dm # CONFIG_IMQ_BEHAVIOR_AA is not set @@ -1364,9 +1391,68 @@ CONFIG_IMQ_BEHAVIOR_AB=3Dy # CONFIG_IMQ_BEHAVIOR_BA is not set # CONFIG_IMQ_BEHAVIOR_BB is not set CONFIG_IMQ_NUM_DEVS=3D2 +CONFIG_MII=3Dm +CONFIG_IEEE802154_DRIVERS=3Dm +CONFIG_IEEE802154_FAKEHARD=3Dm +CONFIG_IFB=3Dm +CONFIG_MACVLAN=3Dm +CONFIG_MACVTAP=3Dm +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set CONFIG_TUN=3Dm CONFIG_VETH=3Dm -CONFIG_MII=3Dm +CONFIG_ATM_DRIVERS=3Dy +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=3Dm + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=3Dm +CONFIG_CAIF_SPI_SLAVE=3Dm +# CONFIG_CAIF_SPI_SYNC is not set +CONFIG_CAIF_HSI=3Dm +CONFIG_ETHERNET=3Dy +CONFIG_NET_VENDOR_BROADCOM=3Dy +CONFIG_B44=3Dm +CONFIG_NET_VENDOR_CHELSIO=3Dy +CONFIG_DM9000=3Dm +# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set +CONFIG_DNET=3Dm +CONFIG_NET_VENDOR_DLINK=3Dy +CONFIG_DE600=3Dm +CONFIG_DE620=3Dm +CONFIG_NET_VENDOR_FARADAY=3Dy +# CONFIG_FTMAC100 is not set +# CONFIG_FTGMAC100 is not set +CONFIG_NET_VENDOR_INTEL=3Dy +CONFIG_NET_VENDOR_I825XX=3Dy +CONFIG_NET_VENDOR_MARVELL=3Dy +CONFIG_NET_VENDOR_MICREL=3Dy +CONFIG_KS8842=3Dm +CONFIG_KS8851_MLL=3Dm +CONFIG_NET_VENDOR_NATSEMI=3Dy +CONFIG_NET_VENDOR_8390=3Dy +CONFIG_AX88796=3Dm +# CONFIG_AX88796_93CX6 is not set +CONFIG_ETHOC=3Dm +CONFIG_NET_VENDOR_SEEQ=3Dy +CONFIG_SEEQ8005=3Dm +CONFIG_NET_VENDOR_SMSC=3Dy +CONFIG_SMC91X=3Dm +CONFIG_SMC911X=3Dm +CONFIG_SMSC911X=3Dm +# CONFIG_SMSC911X_ARCH_HOOKS is not set +CONFIG_NET_VENDOR_STMICRO=3Dy +CONFIG_STMMAC_ETH=3Dm +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_RING=3Dy +# CONFIG_STMMAC_CHAINED is not set +CONFIG_NET_VENDOR_TI=3Dy +# CONFIG_TI_DAVINCI_EMAC is not set +# CONFIG_TI_DAVINCI_MDIO is not set +# CONFIG_TI_DAVINCI_CPDMA is not set CONFIG_PHYLIB=3Dy =20 # @@ -1389,40 +1475,60 @@ CONFIG_MICREL_PHY=3Dm # CONFIG_FIXED_PHY is not set CONFIG_MDIO_BITBANG=3Dm CONFIG_MDIO_GPIO=3Dm -CONFIG_NET_ETHERNET=3Dy -CONFIG_AX88796=3Dm -# CONFIG_AX88796_93CX6 is not set -CONFIG_SMC91X=3Dm -# CONFIG_TI_DAVINCI_EMAC is not set -# CONFIG_TI_DAVINCI_MDIO is not set -# CONFIG_TI_DAVINCI_CPDMA is not set -CONFIG_DM9000=3Dm -CONFIG_DM9000_DEBUGLEVEL=3D4 -# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set -CONFIG_ETHOC=3Dm -CONFIG_SMC911X=3Dm -CONFIG_SMSC911X=3Dm -# CONFIG_SMSC911X_ARCH_HOOKS is not set -CONFIG_DNET=3Dm -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -CONFIG_B44=3Dm -CONFIG_KS8842=3Dm -CONFIG_KS8851_MLL=3Dm -CONFIG_NET_POCKET=3Dy -CONFIG_DE600=3Dm -CONFIG_DE620=3Dm -CONFIG_FTMAC100=3Dm -CONFIG_NETDEV_1000=3Dy -CONFIG_STMMAC_ETH=3Dm -# CONFIG_STMMAC_DA is not set -# CONFIG_STMMAC_DUAL_MAC is not set -CONFIG_NETDEV_10000=3Dy +# CONFIG_PLIP is not set +CONFIG_PPP=3Dm +CONFIG_PPP_BSDCOMP=3Dm +CONFIG_PPP_DEFLATE=3Dm +CONFIG_PPP_FILTER=3Dy +CONFIG_PPP_MPPE=3Dm +CONFIG_PPP_MULTILINK=3Dy +CONFIG_PPPOATM=3Dm +CONFIG_PPPOE=3Dm +CONFIG_PPTP=3Dm +CONFIG_PPPOL2TP=3Dm +CONFIG_PPP_ASYNC=3Dm +CONFIG_PPP_SYNC_TTY=3Dm +CONFIG_SLIP=3Dm +CONFIG_SLHC=3Dm +CONFIG_SLIP_COMPRESSED=3Dy +CONFIG_SLIP_SMART=3Dy +CONFIG_SLIP_MODE_SLIP6=3Dy + +# +# USB Network Adapters +# +CONFIG_USB_CATC=3Dm +CONFIG_USB_KAWETH=3Dm +CONFIG_USB_PEGASUS=3Dm +CONFIG_USB_RTL8150=3Dm +CONFIG_USB_USBNET=3Dm +CONFIG_USB_NET_AX8817X=3Dm +CONFIG_USB_NET_CDCETHER=3Dm +CONFIG_USB_NET_CDC_EEM=3Dm +CONFIG_USB_NET_CDC_NCM=3Dm +CONFIG_USB_NET_DM9601=3Dm +CONFIG_USB_NET_SMSC75XX=3Dm +CONFIG_USB_NET_SMSC95XX=3Dm +CONFIG_USB_NET_GL620A=3Dm +CONFIG_USB_NET_NET1080=3Dm +CONFIG_USB_NET_PLUSB=3Dm +CONFIG_USB_NET_MCS7830=3Dm +CONFIG_USB_NET_RNDIS_HOST=3Dm +CONFIG_USB_NET_CDC_SUBSET=3Dm +CONFIG_USB_ALI_M5632=3Dy +CONFIG_USB_AN2720=3Dy +CONFIG_USB_BELKIN=3Dy +CONFIG_USB_ARMLINUX=3Dy +CONFIG_USB_EPSON2888=3Dy +CONFIG_USB_KC2190=3Dy +CONFIG_USB_NET_ZAURUS=3Dm +CONFIG_USB_NET_CX82310_ETH=3Dm +CONFIG_USB_NET_KALMIA=3Dm +CONFIG_USB_HSO=3Dm +CONFIG_USB_NET_INT51X1=3Dm +# CONFIG_USB_IPHETH is not set +CONFIG_USB_SIERRA_NET=3Dm +CONFIG_USB_VL600=3Dm CONFIG_WLAN=3Dy CONFIG_LIBERTAS_THINFIRM=3Dm # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set @@ -1444,11 +1550,18 @@ CONFIG_ATH9K_HTC=3Dm CONFIG_CARL9170=3Dm CONFIG_CARL9170_LEDS=3Dy CONFIG_CARL9170_WPC=3Dy +CONFIG_CARL9170_HWRNG=3Dy +CONFIG_ATH6KL=3Dm +# CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=3Dm +CONFIG_B43_BCMA=3Dy +CONFIG_B43_SSB=3Dy CONFIG_B43_SDIO=3Dy +CONFIG_B43_BCMA_PIO=3Dy CONFIG_B43_PIO=3Dy CONFIG_B43_PHY_N=3Dy CONFIG_B43_PHY_LP=3Dy +CONFIG_B43_PHY_HT=3Dy CONFIG_B43_LEDS=3Dy CONFIG_B43_HWRNG=3Dy # CONFIG_B43_DEBUG is not set @@ -1461,6 +1574,9 @@ CONFIG_B43LEGACY_PIO=3Dy CONFIG_B43LEGACY_DMA_AND_PIO_MODE=3Dy # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=3Dm +CONFIG_BRCMFMAC=3Dm +# CONFIG_BRCMDBG is not set CONFIG_HOSTAP=3Dm CONFIG_HOSTAP_FIRMWARE=3Dy # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set @@ -1488,7 +1604,6 @@ CONFIG_RT2X00_LIB_FIRMWARE=3Dy CONFIG_RT2X00_LIB_CRYPTO=3Dy CONFIG_RT2X00_LIB_LEDS=3Dy # CONFIG_RT2X00_DEBUG is not set -CONFIG_RTL8192SE=3Dm CONFIG_RTL8192CU=3Dm CONFIG_RTLWIFI=3Dm CONFIG_RTL8192C_COMMON=3Dm @@ -1496,7 +1611,6 @@ CONFIG_WL1251=3Dm CONFIG_WL1251_SDIO=3Dm CONFIG_WL12XX_MENU=3Dm CONFIG_WL12XX=3Dm -# CONFIG_WL12XX_HT is not set CONFIG_WL12XX_SDIO=3Dm # CONFIG_WL12XX_SDIO_TEST is not set CONFIG_WL12XX_PLATFORM_DATA=3Dy @@ -1508,42 +1622,6 @@ CONFIG_MWIFIEX_SDIO=3Dm # # Enable WiMAX (Networking options) to see the WiMAX drivers # - -# -# USB Network Adapters -# -CONFIG_USB_CATC=3Dm -CONFIG_USB_KAWETH=3Dm -CONFIG_USB_PEGASUS=3Dm -CONFIG_USB_RTL8150=3Dm -CONFIG_USB_USBNET=3Dm -CONFIG_USB_NET_AX8817X=3Dm -CONFIG_USB_NET_CDCETHER=3Dm -CONFIG_USB_NET_CDC_EEM=3Dm -CONFIG_USB_NET_CDC_NCM=3Dm -CONFIG_USB_NET_DM9601=3Dm -CONFIG_USB_NET_SMSC75XX=3Dm -CONFIG_USB_NET_SMSC95XX=3Dm -CONFIG_USB_NET_GL620A=3Dm -CONFIG_USB_NET_NET1080=3Dm -CONFIG_USB_NET_PLUSB=3Dm -CONFIG_USB_NET_MCS7830=3Dm -CONFIG_USB_NET_RNDIS_HOST=3Dm -CONFIG_USB_NET_CDC_SUBSET=3Dm -CONFIG_USB_ALI_M5632=3Dy -CONFIG_USB_AN2720=3Dy -CONFIG_USB_BELKIN=3Dy -CONFIG_USB_ARMLINUX=3Dy -CONFIG_USB_EPSON2888=3Dy -CONFIG_USB_KC2190=3Dy -CONFIG_USB_NET_ZAURUS=3Dm -CONFIG_USB_NET_CX82310_ETH=3Dm -CONFIG_USB_NET_KALMIA=3Dm -CONFIG_USB_HSO=3Dm -CONFIG_USB_NET_INT51X1=3Dm -# CONFIG_USB_IPHETH is not set -CONFIG_USB_SIERRA_NET=3Dm -CONFIG_USB_VL600=3Dm CONFIG_WAN=3Dy CONFIG_HDLC=3Dm CONFIG_HDLC_RAW=3Dm @@ -1557,39 +1635,6 @@ CONFIG_HDLC_PPP=3Dm # CONFIG_DLCI=3Dm CONFIG_DLCI_MAX=3D8 -CONFIG_ATM_DRIVERS=3Dy -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_TCP=3Dm -CONFIG_IEEE802154_DRIVERS=3Dm -CONFIG_IEEE802154_FAKEHARD=3Dm - -# -# CAIF transport drivers -# -CONFIG_CAIF_TTY=3Dm -CONFIG_CAIF_SPI_SLAVE=3Dm -# CONFIG_CAIF_SPI_SYNC is not set -# CONFIG_PLIP is not set -CONFIG_PPP=3Dm -CONFIG_PPP_MULTILINK=3Dy -CONFIG_PPP_FILTER=3Dy -CONFIG_PPP_ASYNC=3Dm -CONFIG_PPP_SYNC_TTY=3Dm -CONFIG_PPP_DEFLATE=3Dm -CONFIG_PPP_BSDCOMP=3Dm -CONFIG_PPP_MPPE=3Dm -CONFIG_PPPOE=3Dm -CONFIG_PPTP=3Dm -CONFIG_PPPOATM=3Dm -CONFIG_PPPOL2TP=3Dm -CONFIG_SLIP=3Dm -CONFIG_SLIP_COMPRESSED=3Dy -CONFIG_SLHC=3Dm -CONFIG_SLIP_SMART=3Dy -CONFIG_SLIP_MODE_SLIP6=3Dy -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set CONFIG_ISDN=3Dy CONFIG_ISDN_I4L=3Dm CONFIG_ISDN_PPP=3Dy @@ -1736,14 +1781,18 @@ CONFIG_KEYBOARD_XTKBD=3Dm # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=3Dy # CONFIG_INPUT_AD714X is not set -CONFIG_INPUT_ATI_REMOTE=3Dm +# CONFIG_INPUT_BMA150 is not set +# CONFIG_INPUT_MMA8450 is not set +# CONFIG_INPUT_MPU3050 is not set CONFIG_INPUT_ATI_REMOTE2=3Dm CONFIG_INPUT_KEYSPAN_REMOTE=3Dm +# CONFIG_INPUT_KXTJ9 is not set CONFIG_INPUT_POWERMATE=3Dm CONFIG_INPUT_YEALINK=3Dm CONFIG_INPUT_CM109=3Dm CONFIG_INPUT_TWL4030_PWRBUTTON=3Dm CONFIG_INPUT_TWL4030_VIBRA=3Dm +CONFIG_INPUT_TWL6040_VIBRA=3Dm # CONFIG_INPUT_UINPUT is not set CONFIG_INPUT_PCF50633_PMU=3Dm CONFIG_INPUT_PCF8574=3Dm @@ -1770,6 +1819,7 @@ CONFIG_SERIO_PS2MULT=3Dm CONFIG_VT=3Dy CONFIG_CONSOLE_TRANSLATIONS=3Dy CONFIG_VT_CONSOLE=3Dy +CONFIG_VT_CONSOLE_SLEEP=3Dy CONFIG_HW_CONSOLE=3Dy # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_UNIX98_PTYS=3Dy @@ -1793,6 +1843,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=3Dy CONFIG_SERIAL_8250_SHARE_IRQ=3Dy CONFIG_SERIAL_8250_DETECT_IRQ=3Dy CONFIG_SERIAL_8250_RSA=3Dy +CONFIG_SERIAL_8250_DW=3Dm =20 # # Non-8250 serial port support @@ -1851,7 +1902,7 @@ CONFIG_I2C_ALGOPCA=3Dm # # I2C system bus drivers (mostly embedded / system-on-chip) # -CONFIG_I2C_DESIGNWARE=3Dm +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set CONFIG_I2C_GPIO=3Dm CONFIG_I2C_OCORES=3Dm CONFIG_I2C_OMAP=3Dy @@ -1890,6 +1941,7 @@ CONFIG_PPS=3Dm CONFIG_PPS_CLIENT_KTIMER=3Dm CONFIG_PPS_CLIENT_LDISC=3Dm CONFIG_PPS_CLIENT_PARPORT=3Dm +CONFIG_PPS_CLIENT_GPIO=3Dm =20 # # PPS generators support @@ -1904,13 +1956,13 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=3Dy CONFIG_GPIOLIB=3Dy # CONFIG_DEBUG_GPIO is not set # CONFIG_GPIO_SYSFS is not set +CONFIG_GPIO_GENERIC=3Dm CONFIG_GPIO_MAX730X=3Dm =20 # # Memory mapped GPIO drivers: # -CONFIG_GPIO_BASIC_MMIO_CORE=3Dm -CONFIG_GPIO_BASIC_MMIO=3Dm +CONFIG_GPIO_GENERIC_PLATFORM=3Dm CONFIG_GPIO_IT8761E=3Dm =20 # @@ -1930,6 +1982,7 @@ CONFIG_GPIO_ADP5588=3Dm # # SPI GPIO expanders: # +CONFIG_GPIO_MCP23S08=3Dm =20 # # AC97 GPIO expanders: @@ -2033,22 +2086,28 @@ CONFIG_SENSORS_LTC4215=3Dm CONFIG_SENSORS_LTC4245=3Dm CONFIG_SENSORS_LTC4261=3Dm CONFIG_SENSORS_LM95241=3Dm +CONFIG_SENSORS_LM95245=3Dm CONFIG_SENSORS_MAX16065=3Dm CONFIG_SENSORS_MAX1619=3Dm +CONFIG_SENSORS_MAX1668=3Dm CONFIG_SENSORS_MAX6639=3Dm CONFIG_SENSORS_MAX6642=3Dm CONFIG_SENSORS_MAX6650=3Dm +CONFIG_SENSORS_NTC_THERMISTOR=3Dm CONFIG_SENSORS_PC87360=3Dm CONFIG_SENSORS_PC87427=3Dm CONFIG_SENSORS_PCF8591=3Dm CONFIG_PMBUS=3Dm CONFIG_SENSORS_PMBUS=3Dm CONFIG_SENSORS_ADM1275=3Dm +CONFIG_SENSORS_LM25066=3Dm +CONFIG_SENSORS_LTC2978=3Dm CONFIG_SENSORS_MAX16064=3Dm CONFIG_SENSORS_MAX34440=3Dm CONFIG_SENSORS_MAX8688=3Dm CONFIG_SENSORS_UCD9000=3Dm CONFIG_SENSORS_UCD9200=3Dm +CONFIG_SENSORS_ZL6100=3Dm CONFIG_SENSORS_SHT15=3Dm CONFIG_SENSORS_SHT21=3Dm CONFIG_SENSORS_SMM665=3Dm @@ -2059,7 +2118,9 @@ CONFIG_SENSORS_EMC6W201=3Dm CONFIG_SENSORS_SMSC47M1=3Dm CONFIG_SENSORS_SMSC47M192=3Dm CONFIG_SENSORS_SMSC47B397=3Dm +CONFIG_SENSORS_SCH56XX_COMMON=3Dm CONFIG_SENSORS_SCH5627=3Dm +CONFIG_SENSORS_SCH5636=3Dm CONFIG_SENSORS_ADS1015=3Dm CONFIG_SENSORS_ADS7828=3Dm CONFIG_SENSORS_AMC6821=3Dm @@ -2081,12 +2142,14 @@ CONFIG_SENSORS_W83627HF=3Dm CONFIG_SENSORS_W83627EHF=3Dm CONFIG_THERMAL=3Dy CONFIG_WATCHDOG=3Dy +CONFIG_WATCHDOG_CORE=3Dy # CONFIG_WATCHDOG_NOWAYOUT is not set =20 # # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=3Dm +# CONFIG_DW_WATCHDOG is not set CONFIG_MPCORE_WATCHDOG=3Dm CONFIG_OMAP_WATCHDOG=3Dm CONFIG_TWL4030_WATCHDOG=3Dm @@ -2113,8 +2176,12 @@ CONFIG_BCMA_POSSIBLE=3Dy # Broadcom specific AMBA # CONFIG_BCMA=3Dm +CONFIG_BCMA_BLOCKIO=3Dy # CONFIG_BCMA_DEBUG is not set -CONFIG_MFD_SUPPORT=3Dy + +# +# Multifunction device drivers +# CONFIG_MFD_CORE=3Dy # CONFIG_MFD_88PM860X is not set CONFIG_MFD_SM501=3Dm @@ -2127,12 +2194,15 @@ CONFIG_HTC_PASIC3=3Dm CONFIG_TPS65010=3Dm # CONFIG_TPS6507X is not set # CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912_I2C is not set CONFIG_MENELAUS=3Dy CONFIG_TWL4030_CORE=3Dy CONFIG_TWL4030_MADC=3Dm CONFIG_TWL4030_POWER=3Dy -CONFIG_TWL4030_CODEC=3Dy +CONFIG_MFD_TWL4030_AUDIO=3Dy CONFIG_TWL6030_PWM=3Dm +CONFIG_TWL6040_CORE=3Dy # CONFIG_MFD_STMPE is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TMIO is not set @@ -2154,13 +2224,14 @@ CONFIG_PCF50633_GPIO=3Dm # CONFIG_ABX500_CORE is not set CONFIG_MFD_WL1273_CORE=3Dm CONFIG_MFD_OMAP_USB_HOST=3Dy -# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_AAT2870_CORE is not set CONFIG_REGULATOR=3Dy # CONFIG_REGULATOR_DEBUG is not set # CONFIG_REGULATOR_DUMMY is not set CONFIG_REGULATOR_FIXED_VOLTAGE=3Dy # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_GPIO is not set # CONFIG_REGULATOR_BQ24022 is not set # CONFIG_REGULATOR_MAX1586 is not set # CONFIG_REGULATOR_MAX8649 is not set @@ -2184,6 +2255,7 @@ CONFIG_MEDIA_SUPPORT=3Dm CONFIG_VIDEO_DEV=3Dm CONFIG_VIDEO_V4L2_COMMON=3Dm CONFIG_DVB_CORE=3Dm +CONFIG_DVB_NET=3Dy CONFIG_VIDEO_MEDIA=3Dm =20 # @@ -2198,7 +2270,9 @@ CONFIG_IR_RC6_DECODER=3Dm CONFIG_IR_JVC_DECODER=3Dm CONFIG_IR_SONY_DECODER=3Dm CONFIG_IR_RC5_SZ_DECODER=3Dm +CONFIG_IR_MCE_KBD_DECODER=3Dm CONFIG_IR_LIRC_CODEC=3Dm +CONFIG_RC_ATI_REMOTE=3Dm # CONFIG_IR_IMON is not set # CONFIG_IR_MCEUSB is not set # CONFIG_IR_REDRAT3 is not set @@ -2220,6 +2294,7 @@ CONFIG_MEDIA_TUNER_MT2266=3Dm CONFIG_MEDIA_TUNER_QT1010=3Dm CONFIG_MEDIA_TUNER_XC2028=3Dm CONFIG_MEDIA_TUNER_XC5000=3Dm +CONFIG_MEDIA_TUNER_XC4000=3Dm CONFIG_MEDIA_TUNER_MXL5005S=3Dm CONFIG_MEDIA_TUNER_MXL5007T=3Dm CONFIG_MEDIA_TUNER_MC44S803=3Dm @@ -2236,6 +2311,7 @@ CONFIG_VIDEO_TUNER=3Dm CONFIG_VIDEOBUF2_CORE=3Dm CONFIG_VIDEOBUF2_MEMOPS=3Dm CONFIG_VIDEOBUF2_DMA_CONTIG=3Dm +CONFIG_VIDEOBUF2_VMALLOC=3Dm CONFIG_VIDEO_CAPTURE_DRIVERS=3Dy # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set @@ -2310,6 +2386,11 @@ CONFIG_VIDEO_CX2341X=3Dm # CONFIG_VIDEO_OV7670 is not set # CONFIG_VIDEO_MT9V011 is not set # CONFIG_VIDEO_TCM825X is not set +CONFIG_VIDEO_SR030PC30=3Dm + +# +# Flash devices +# =20 # # Video improvement chips @@ -2331,8 +2412,6 @@ CONFIG_VIDEO_W9966=3Dm CONFIG_VIDEO_CPIA2=3Dm CONFIG_VIDEO_TIMBERDALE=3Dm CONFIG_VIDEO_AU0828=3Dm -CONFIG_VIDEO_SR030PC30=3Dm -CONFIG_VIDEO_NOON010PC30=3Dm CONFIG_SOC_CAMERA=3Dm CONFIG_SOC_CAMERA_IMX074=3Dm CONFIG_SOC_CAMERA_MT9M001=3Dm @@ -2344,6 +2423,7 @@ CONFIG_SOC_CAMERA_RJ54N1=3Dm CONFIG_SOC_CAMERA_TW9910=3Dm CONFIG_SOC_CAMERA_PLATFORM=3Dm CONFIG_SOC_CAMERA_OV2640=3Dm +CONFIG_SOC_CAMERA_OV5642=3Dm CONFIG_SOC_CAMERA_OV6650=3Dm CONFIG_SOC_CAMERA_OV772X=3Dm CONFIG_SOC_CAMERA_OV9640=3Dm @@ -2355,49 +2435,51 @@ CONFIG_V4L_USB_DRIVERS=3Dy # CONFIG_USB_VIDEO_CLASS is not set CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=3Dy CONFIG_USB_GSPCA=3Dm -# CONFIG_USB_M5602 is not set -# CONFIG_USB_STV06XX is not set -# CONFIG_USB_GL860 is not set -# CONFIG_USB_GSPCA_BENQ is not set -# CONFIG_USB_GSPCA_CONEX is not set -# CONFIG_USB_GSPCA_CPIA1 is not set -# CONFIG_USB_GSPCA_ETOMS is not set -# CONFIG_USB_GSPCA_FINEPIX is not set -# CONFIG_USB_GSPCA_JEILINJ is not set -# CONFIG_USB_GSPCA_KINECT is not set -# CONFIG_USB_GSPCA_KONICA is not set -# CONFIG_USB_GSPCA_MARS is not set -# CONFIG_USB_GSPCA_MR97310A is not set -# CONFIG_USB_GSPCA_NW80X is not set -# CONFIG_USB_GSPCA_OV519 is not set -# CONFIG_USB_GSPCA_OV534 is not set -# CONFIG_USB_GSPCA_OV534_9 is not set -# CONFIG_USB_GSPCA_PAC207 is not set -# CONFIG_USB_GSPCA_PAC7302 is not set -# CONFIG_USB_GSPCA_PAC7311 is not set -# CONFIG_USB_GSPCA_SN9C2028 is not set -# CONFIG_USB_GSPCA_SN9C20X is not set -# CONFIG_USB_GSPCA_SONIXB is not set -# CONFIG_USB_GSPCA_SONIXJ is not set -# CONFIG_USB_GSPCA_SPCA500 is not set -# CONFIG_USB_GSPCA_SPCA501 is not set -# CONFIG_USB_GSPCA_SPCA505 is not set -# CONFIG_USB_GSPCA_SPCA506 is not set -# CONFIG_USB_GSPCA_SPCA508 is not set -# CONFIG_USB_GSPCA_SPCA561 is not set -# CONFIG_USB_GSPCA_SPCA1528 is not set -# CONFIG_USB_GSPCA_SQ905 is not set -# CONFIG_USB_GSPCA_SQ905C is not set -# CONFIG_USB_GSPCA_SQ930X is not set -# CONFIG_USB_GSPCA_STK014 is not set -# CONFIG_USB_GSPCA_STV0680 is not set -# CONFIG_USB_GSPCA_SUNPLUS is not set -# CONFIG_USB_GSPCA_T613 is not set -# CONFIG_USB_GSPCA_TV8532 is not set -# CONFIG_USB_GSPCA_VC032X is not set -# CONFIG_USB_GSPCA_VICAM is not set -# CONFIG_USB_GSPCA_XIRLINK_CIT is not set -# CONFIG_USB_GSPCA_ZC3XX is not set +CONFIG_USB_M5602=3Dm +CONFIG_USB_STV06XX=3Dm +CONFIG_USB_GL860=3Dm +CONFIG_USB_GSPCA_BENQ=3Dm +CONFIG_USB_GSPCA_CONEX=3Dm +CONFIG_USB_GSPCA_CPIA1=3Dm +CONFIG_USB_GSPCA_ETOMS=3Dm +CONFIG_USB_GSPCA_FINEPIX=3Dm +CONFIG_USB_GSPCA_JEILINJ=3Dm +CONFIG_USB_GSPCA_KINECT=3Dm +CONFIG_USB_GSPCA_KONICA=3Dm +CONFIG_USB_GSPCA_MARS=3Dm +CONFIG_USB_GSPCA_MR97310A=3Dm +CONFIG_USB_GSPCA_NW80X=3Dm +CONFIG_USB_GSPCA_OV519=3Dm +CONFIG_USB_GSPCA_OV534=3Dm +CONFIG_USB_GSPCA_OV534_9=3Dm +CONFIG_USB_GSPCA_PAC207=3Dm +CONFIG_USB_GSPCA_PAC7302=3Dm +CONFIG_USB_GSPCA_PAC7311=3Dm +CONFIG_USB_GSPCA_SE401=3Dm +CONFIG_USB_GSPCA_SN9C2028=3Dm +CONFIG_USB_GSPCA_SN9C20X=3Dm +CONFIG_USB_GSPCA_SONIXB=3Dm +CONFIG_USB_GSPCA_SONIXJ=3Dm +CONFIG_USB_GSPCA_SPCA500=3Dm +CONFIG_USB_GSPCA_SPCA501=3Dm +CONFIG_USB_GSPCA_SPCA505=3Dm +CONFIG_USB_GSPCA_SPCA506=3Dm +CONFIG_USB_GSPCA_SPCA508=3Dm +CONFIG_USB_GSPCA_SPCA561=3Dm +CONFIG_USB_GSPCA_SPCA1528=3Dm +CONFIG_USB_GSPCA_SQ905=3Dm +CONFIG_USB_GSPCA_SQ905C=3Dm +CONFIG_USB_GSPCA_SQ930X=3Dm +CONFIG_USB_GSPCA_STK014=3Dm +CONFIG_USB_GSPCA_STV0680=3Dm +CONFIG_USB_GSPCA_SUNPLUS=3Dm +CONFIG_USB_GSPCA_T613=3Dm +CONFIG_USB_GSPCA_TOPRO=3Dm +CONFIG_USB_GSPCA_TV8532=3Dm +CONFIG_USB_GSPCA_VC032X=3Dm +CONFIG_USB_GSPCA_VICAM=3Dm +CONFIG_USB_GSPCA_XIRLINK_CIT=3Dm +CONFIG_USB_GSPCA_ZC3XX=3Dm CONFIG_VIDEO_PVRUSB2=3Dm CONFIG_VIDEO_PVRUSB2_SYSFS=3Dy CONFIG_VIDEO_PVRUSB2_DVB=3Dy @@ -2406,11 +2488,13 @@ CONFIG_VIDEO_HDPVR=3Dm CONFIG_VIDEO_EM28XX=3Dm # CONFIG_VIDEO_EM28XX_ALSA is not set CONFIG_VIDEO_EM28XX_DVB=3Dm +CONFIG_VIDEO_EM28XX_RC=3Dy CONFIG_VIDEO_TLG2300=3Dm CONFIG_VIDEO_CX231XX=3Dm CONFIG_VIDEO_CX231XX_RC=3Dy CONFIG_VIDEO_CX231XX_ALSA=3Dm CONFIG_VIDEO_CX231XX_DVB=3Dm +# CONFIG_VIDEO_TM6000 is not set CONFIG_VIDEO_USBVISION=3Dm CONFIG_USB_ET61X251=3Dm CONFIG_USB_SN9C102=3Dm @@ -2439,7 +2523,7 @@ CONFIG_RADIO_WL128X=3Dm CONFIG_DVB_MAX_ADAPTERS=3D8 # CONFIG_DVB_DYNAMIC_MINORS is not set CONFIG_DVB_CAPTURE_DRIVERS=3Dy -# CONFIG_TTPCI_EEPROM is not set +CONFIG_TTPCI_EEPROM=3Dm =20 # # Supported USB Adapters @@ -2466,6 +2550,7 @@ CONFIG_DVB_USB_DTT200U=3Dm CONFIG_DVB_USB_OPERA1=3Dm CONFIG_DVB_USB_AF9005=3Dm CONFIG_DVB_USB_AF9005_REMOTE=3Dm +CONFIG_DVB_USB_PCTV452E=3Dm CONFIG_DVB_USB_DW2102=3Dm CONFIG_DVB_USB_CINERGY_T2=3Dm CONFIG_DVB_USB_ANYSEE=3Dm @@ -2477,6 +2562,8 @@ CONFIG_DVB_USB_EC168=3Dm CONFIG_DVB_USB_AZ6027=3Dm CONFIG_DVB_USB_LME2510=3Dm CONFIG_DVB_USB_TECHNISAT_USB2=3Dm +CONFIG_DVB_USB_IT913X=3Dm +CONFIG_DVB_USB_MXL111SF=3Dm CONFIG_SMS_SIANO_MDTV=3Dm =20 # @@ -2504,6 +2591,12 @@ CONFIG_DVB_STV090x=3Dm CONFIG_DVB_STV6110x=3Dm =20 # +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=3Dm +CONFIG_DVB_TDA18271C2DD=3Dm + +# # DVB-S (satellite) frontends # CONFIG_DVB_MT312=3Dm @@ -2518,6 +2611,7 @@ CONFIG_DVB_TDA826X=3Dm CONFIG_DVB_CX24116=3Dm CONFIG_DVB_SI21XX=3Dm CONFIG_DVB_DS3000=3Dm +CONFIG_DVB_TDA10071=3Dm =20 # # DVB-T (terrestrial) frontends @@ -2569,10 +2663,13 @@ CONFIG_DVB_TUNER_DIB0090=3Dm # SEC control devices for DVB-S # CONFIG_DVB_LNBP21=3Dm +CONFIG_DVB_LNBP22=3Dm CONFIG_DVB_ISL6423=3Dm +CONFIG_DVB_A8293=3Dm CONFIG_DVB_LGS8GXX=3Dm CONFIG_DVB_ATBM8830=3Dm CONFIG_DVB_IX2505V=3Dm +CONFIG_DVB_IT913X_FE=3Dm =20 # # Tools to develop new frontends @@ -2582,24 +2679,23 @@ CONFIG_DVB_IX2505V=3Dm # # Graphics support # -CONFIG_DRM=3Dm +# CONFIG_DRM is not set # CONFIG_VGASTATE is not set -CONFIG_VIDEO_OUTPUT_CONTROL=3Dm +# CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=3Dy -CONFIG_FIRMWARE_EDID=3Dy +# CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set -CONFIG_FB_CFB_FILLRECT=3Dm -CONFIG_FB_CFB_COPYAREA=3Dm -CONFIG_FB_CFB_IMAGEBLIT=3Dm +CONFIG_FB_CFB_FILLRECT=3Dy +CONFIG_FB_CFB_COPYAREA=3Dy +CONFIG_FB_CFB_IMAGEBLIT=3Dy # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=3Dm -CONFIG_FB_SYS_COPYAREA=3Dm -CONFIG_FB_SYS_IMAGEBLIT=3Dm +# 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=3Dm +# CONFIG_FB_SYS_FOPS is not set # CONFIG_FB_WMT_GE_ROPS is not set -CONFIG_FB_DEFERRED_IO=3Dy # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -2609,32 +2705,57 @@ CONFIG_FB_TILEBLITTING=3Dy # # Frame buffer hardware drivers # -CONFIG_FB_UVESA=3Dm +# CONFIG_FB_UVESA is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_TMIO=3Dm -CONFIG_FB_TMIO_ACCELL=3Dy -CONFIG_FB_SM501=3Dm +# CONFIG_FB_TMIO is not set +# CONFIG_FB_SM501 is not set +# CONFIG_FB_SMSCUFX is not set # CONFIG_FB_UDL is not set # CONFIG_FB_VIRTUAL is not set -CONFIG_FB_METRONOME=3Dm +# CONFIG_FB_METRONOME is not set # CONFIG_FB_BROADSHEET is not set -# CONFIG_FB_OMAP is not set -# CONFIG_FB_OMAP_LCD_VGA is not set -# CONFIG_OMAP2_DSS is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_OMAP2_VRAM=3Dy +CONFIG_OMAP2_VRFB=3Dy +CONFIG_OMAP2_DSS=3Dy +CONFIG_OMAP2_VRAM_SIZE=3D32 +CONFIG_OMAP2_DSS_DEBUG_SUPPORT=3Dy +# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set +CONFIG_OMAP2_DSS_DPI=3Dy +# CONFIG_OMAP2_DSS_RFBI is not set +# CONFIG_OMAP2_DSS_VENC is not set +CONFIG_OMAP4_DSS_HDMI=3Dy +# CONFIG_OMAP2_DSS_SDI is not set +CONFIG_OMAP2_DSS_DSI=3Dy +# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=3D0 +CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=3Dy +CONFIG_FB_OMAP2=3Dy +CONFIG_FB_OMAP2_DEBUG_SUPPORT=3Dy +CONFIG_FB_OMAP2_NUM_FBS=3D3 + +# +# OMAP2/3 Display Device Drivers +# +CONFIG_PANEL_GENERIC_DPI=3Dy +CONFIG_PANEL_DVI=3Dy +CONFIG_PANEL_SHARP_LS037V7DW01=3Dy +# CONFIG_PANEL_PICODLP is not set +CONFIG_PANEL_TAAL=3Dy CONFIG_BACKLIGHT_LCD_SUPPORT=3Dy CONFIG_LCD_CLASS_DEVICE=3Dm CONFIG_LCD_PLATFORM=3Dm CONFIG_BACKLIGHT_CLASS_DEVICE=3Dy -CONFIG_BACKLIGHT_GENERIC=3Dm -# CONFIG_BACKLIGHT_PWM is not set -# CONFIG_BACKLIGHT_ADP8860 is not set -# CONFIG_BACKLIGHT_ADP8870 is not set -# CONFIG_BACKLIGHT_PCF50633 is not set +CONFIG_BACKLIGHT_GENERIC=3Dy +CONFIG_BACKLIGHT_PWM=3Dm +CONFIG_BACKLIGHT_ADP8860=3Dm +CONFIG_BACKLIGHT_ADP8870=3Dm +CONFIG_BACKLIGHT_PCF50633=3Dm =20 # # Display device support # -CONFIG_DISPLAY_SUPPORT=3Dm +CONFIG_DISPLAY_SUPPORT=3Dy =20 # # Display hardware drivers @@ -2645,11 +2766,19 @@ CONFIG_DISPLAY_SUPPORT=3Dm # CONFIG_DUMMY_CONSOLE=3Dy CONFIG_FRAMEBUFFER_CONSOLE=3Dy -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=3Dy # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_FONTS is not set +CONFIG_FONTS=3Dy CONFIG_FONT_8x8=3Dy CONFIG_FONT_8x16=3Dy +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set CONFIG_LOGO=3Dy CONFIG_LOGO_LINUX_MONO=3Dy CONFIG_LOGO_LINUX_VGA16=3Dy @@ -2709,6 +2838,7 @@ CONFIG_SND_OMAP_SOC_OMAP3EVM=3Dm CONFIG_SND_OMAP_SOC_AM3517EVM=3Dm CONFIG_SND_OMAP_SOC_SDP3430=3Dm CONFIG_SND_OMAP_SOC_SDP4430=3Dm +# CONFIG_SND_OMAP_SOC_OMAP4_HDMI is not set CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=3Dm CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=3Dm CONFIG_SND_OMAP_SOC_ZOOM2=3Dm @@ -2718,6 +2848,8 @@ CONFIG_SND_SOC_ALL_CODECS=3Dm CONFIG_SND_SOC_WM_HUBS=3Dm CONFIG_SND_SOC_AD193X=3Dm CONFIG_SND_SOC_AD73311=3Dm +CONFIG_SND_SOC_ADAU1373=3Dm +CONFIG_SND_SOC_ADAV80X=3Dm CONFIG_SND_SOC_ADS117X=3Dm CONFIG_SND_SOC_AK4535=3Dm CONFIG_SND_SOC_AK4641=3Dm @@ -2728,6 +2860,7 @@ CONFIG_SND_SOC_CS42L51=3Dm CONFIG_SND_SOC_CS4270=3Dm CONFIG_SND_SOC_CS4271=3Dm CONFIG_SND_SOC_CX20442=3Dm +CONFIG_SND_SOC_JZ4740_CODEC=3Dm CONFIG_SND_SOC_L3=3Dm CONFIG_SND_SOC_DA7210=3Dm CONFIG_SND_SOC_DFBMCS320=3Dm @@ -2735,11 +2868,13 @@ CONFIG_SND_SOC_MAX98088=3Dm CONFIG_SND_SOC_MAX98095=3Dm CONFIG_SND_SOC_MAX9850=3Dm CONFIG_SND_SOC_PCM3008=3Dm +CONFIG_SND_SOC_RT5631=3Dm CONFIG_SND_SOC_SGTL5000=3Dm CONFIG_SND_SOC_SPDIF=3Dm CONFIG_SND_SOC_SSM2602=3Dm +CONFIG_SND_SOC_STA32X=3Dm CONFIG_SND_SOC_TLV320AIC23=3Dm -CONFIG_SND_SOC_TVL320AIC32X4=3Dm +CONFIG_SND_SOC_TLV320AIC32X4=3Dm CONFIG_SND_SOC_TLV320AIC3X=3Dm CONFIG_SND_SOC_TLV320DAC33=3Dm CONFIG_SND_SOC_TWL4030=3Dm @@ -2748,6 +2883,7 @@ CONFIG_SND_SOC_UDA134X=3Dm CONFIG_SND_SOC_UDA1380=3Dm CONFIG_SND_SOC_WL1273=3Dm CONFIG_SND_SOC_WM1250_EV1=3Dm +CONFIG_SND_SOC_WM5100=3Dm CONFIG_SND_SOC_WM8400=3Dm CONFIG_SND_SOC_WM8510=3Dm CONFIG_SND_SOC_WM8523=3Dm @@ -2761,11 +2897,11 @@ CONFIG_SND_SOC_WM8741=3Dm CONFIG_SND_SOC_WM8750=3Dm CONFIG_SND_SOC_WM8753=3Dm CONFIG_SND_SOC_WM8776=3Dm +CONFIG_SND_SOC_WM8782=3Dm CONFIG_SND_SOC_WM8804=3Dm CONFIG_SND_SOC_WM8900=3Dm CONFIG_SND_SOC_WM8903=3Dm CONFIG_SND_SOC_WM8904=3Dm -CONFIG_SND_SOC_WM8915=3Dm CONFIG_SND_SOC_WM8940=3Dm CONFIG_SND_SOC_WM8955=3Dm CONFIG_SND_SOC_WM8960=3Dm @@ -2774,12 +2910,14 @@ CONFIG_SND_SOC_WM8962=3Dm CONFIG_SND_SOC_WM8971=3Dm CONFIG_SND_SOC_WM8974=3Dm CONFIG_SND_SOC_WM8978=3Dm +CONFIG_SND_SOC_WM8983=3Dm CONFIG_SND_SOC_WM8985=3Dm CONFIG_SND_SOC_WM8988=3Dm CONFIG_SND_SOC_WM8990=3Dm CONFIG_SND_SOC_WM8991=3Dm CONFIG_SND_SOC_WM8993=3Dm CONFIG_SND_SOC_WM8995=3Dm +CONFIG_SND_SOC_WM8996=3Dm CONFIG_SND_SOC_WM9081=3Dm CONFIG_SND_SOC_LM4857=3Dm CONFIG_SND_SOC_MAX9877=3Dm @@ -2819,6 +2957,7 @@ CONFIG_HID_DRAGONRISE=3Dm CONFIG_DRAGONRISE_FF=3Dy # CONFIG_HID_EMS_FF is not set CONFIG_HID_EZKEY=3Dm +# CONFIG_HID_HOLTEK is not set # CONFIG_HID_KEYTOUCH is not set CONFIG_HID_KYE=3Dm # CONFIG_HID_UCLOGIC is not set @@ -2828,10 +2967,11 @@ CONFIG_HID_TWINHAN=3Dm CONFIG_HID_KENSINGTON=3Dm # CONFIG_HID_LCPOWER is not set CONFIG_HID_LOGITECH=3Dm +CONFIG_HID_LOGITECH_DJ=3Dm CONFIG_LOGITECH_FF=3Dy CONFIG_LOGIRUMBLEPAD2_FF=3Dy # CONFIG_LOGIG940_FF is not set -# CONFIG_LOGIWII_FF is not set +CONFIG_LOGIWHEELS_FF=3Dy CONFIG_HID_MICROSOFT=3Dm CONFIG_HID_MONTEREY=3Dm # CONFIG_HID_MULTITOUCH is not set @@ -2841,15 +2981,12 @@ CONFIG_HID_PANTHERLORD=3Dm CONFIG_PANTHERLORD_FF=3Dy CONFIG_HID_PETALYNX=3Dm # CONFIG_HID_PICOLCD is not set +CONFIG_HID_PRIMAX=3Dm # CONFIG_HID_QUANTA is not set # CONFIG_HID_ROCCAT is not set -# CONFIG_HID_ROCCAT_ARVO is not set -# CONFIG_HID_ROCCAT_KONE is not set -# CONFIG_HID_ROCCAT_KONEPLUS is not set -# CONFIG_HID_ROCCAT_KOVAPLUS is not set -# CONFIG_HID_ROCCAT_PYRA is not set CONFIG_HID_SAMSUNG=3Dm CONFIG_HID_SONY=3Dm +CONFIG_HID_SPEEDLINK=3Dm CONFIG_HID_SUNPLUS=3Dm CONFIG_HID_GREENASIA=3Dm CONFIG_GREENASIA_FF=3Dy @@ -2862,9 +2999,11 @@ CONFIG_HID_ZEROPLUS=3Dm CONFIG_ZEROPLUS_FF=3Dy # CONFIG_HID_ZYDACRON is not set CONFIG_USB_SUPPORT=3Dy +CONFIG_USB_COMMON=3Dy CONFIG_USB_ARCH_HAS_HCD=3Dy CONFIG_USB_ARCH_HAS_OHCI=3Dy CONFIG_USB_ARCH_HAS_EHCI=3Dy +# CONFIG_USB_ARCH_HAS_XHCI is not set CONFIG_USB=3Dy # CONFIG_USB_DEBUG is not set CONFIG_USB_ANNOUNCE_NEW_DEVICES=3Dy @@ -2879,6 +3018,7 @@ CONFIG_USB_SUSPEND=3Dy # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_DWC3 is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -2891,8 +3031,8 @@ CONFIG_USB_EHCI_HCD=3Dy CONFIG_USB_EHCI_ROOT_HUB_TT=3Dy CONFIG_USB_EHCI_TT_NEWSCHED=3Dy CONFIG_USB_EHCI_HCD_OMAP=3Dy -CONFIG_USB_OXU210HP_HCD=3Dm -CONFIG_USB_ISP116X_HCD=3Dm +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1760_HCD is not set # CONFIG_USB_ISP1362_HCD is not set CONFIG_USB_OHCI_HCD=3Dy @@ -2901,12 +3041,10 @@ CONFIG_USB_OHCI_HCD_OMAP3=3Dy # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=3Dy -CONFIG_USB_U132_HCD=3Dm -CONFIG_USB_SL811_HCD=3Dm -# CONFIG_USB_SL811_HCD_ISO is not set -CONFIG_USB_R8A66597_HCD=3Dm +# CONFIG_USB_U132_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_HWA_HCD is not set -# CONFIG_USB_MUSB_HDRC is not set =20 # # USB Device Class drivers @@ -2926,6 +3064,7 @@ CONFIG_USB_TMC=3Dm CONFIG_USB_STORAGE=3Dm # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=3Dm +CONFIG_REALTEK_AUTOPM=3Dy # CONFIG_USB_STORAGE_DATAFAB is not set CONFIG_USB_STORAGE_FREECOM=3Dm CONFIG_USB_STORAGE_ISD200=3Dm @@ -3046,7 +3185,7 @@ CONFIG_USB_GPIO_VBUS=3Dm # CONFIG_USB_ULPI is not set CONFIG_TWL4030_USB=3Dm CONFIG_TWL6030_USB=3Dm -CONFIG_NOP_USB_XCEIV=3Dm +# CONFIG_NOP_USB_XCEIV is not set CONFIG_MMC=3Dy # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set @@ -3065,12 +3204,12 @@ CONFIG_MMC_TEST=3Dm # MMC/SD/SDIO Host Controller Drivers # CONFIG_MMC_SDHCI=3Dm -CONFIG_MMC_SDHCI_OF=3Dm CONFIG_MMC_SDHCI_PLTFM=3Dm +# CONFIG_MMC_SDHCI_PXAV3 is not set +# CONFIG_MMC_SDHCI_PXAV2 is not set CONFIG_MMC_OMAP=3Dy CONFIG_MMC_OMAP_HS=3Dy -CONFIG_MMC_DW=3Dm -# CONFIG_MMC_DW_IDMAC is not set +# CONFIG_MMC_DW is not set CONFIG_MMC_VUB300=3Dm CONFIG_MMC_USHC=3Dm CONFIG_MEMSTICK=3Dm @@ -3095,8 +3234,6 @@ CONFIG_LEDS_CLASS=3Dy CONFIG_LEDS_PCA9532=3Dm # CONFIG_LEDS_PCA9532_GPIO is not set CONFIG_LEDS_GPIO=3Dm -CONFIG_LEDS_GPIO_PLATFORM=3Dy -CONFIG_LEDS_GPIO_OF=3Dy CONFIG_LEDS_LP3944=3Dm # CONFIG_LEDS_LP5521 is not set # CONFIG_LEDS_LP5523 is not set @@ -3105,6 +3242,7 @@ CONFIG_LEDS_PCA955X=3Dm # CONFIG_LEDS_REGULATOR is not set CONFIG_LEDS_BD2802=3Dm # CONFIG_LEDS_LT3593 is not set +# CONFIG_LEDS_RENESAS_TPU is not set CONFIG_LEDS_TRIGGERS=3Dy =20 # @@ -3119,7 +3257,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=3Dm # # iptables trigger is under Netfilter config (LED target) # -# CONFIG_NFC_DEVICES is not set # CONFIG_ACCESSIBILITY is not set CONFIG_RTC_LIB=3Dy CONFIG_RTC_CLASS=3Dy @@ -3206,17 +3343,22 @@ CONFIG_ASYNC_TX_DMA=3Dy CONFIG_UIO=3Dm CONFIG_UIO_PDRV=3Dm CONFIG_UIO_PDRV_GENIRQ=3Dm + +# +# Virtio drivers +# +# CONFIG_VIRTIO_BALLOON is not set +# CONFIG_VIRTIO_MMIO is not set CONFIG_STAGING=3Dy -# CONFIG_VIDEO_TM6000 is not set # CONFIG_USBIP_CORE is not set # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set -# CONFIG_BRCMUTIL is not set # CONFIG_ASUS_OLED is not set # CONFIG_PANEL is not set CONFIG_R8712U=3Dm -CONFIG_R8712_AP=3Dy +CONFIG_RTS5139=3Dm +# CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set # CONFIG_POHMELFS is not set # CONFIG_LINE6_USB is not set @@ -3227,28 +3369,7 @@ CONFIG_R8712_AP=3Dy # CONFIG_XVMALLOC is not set # CONFIG_ZRAM is not set # CONFIG_FB_SM7XX is not set -# CONFIG_LIRC_STAGING is not set -# CONFIG_EASYCAP is not set # CONFIG_TIDSPBRIDGE is not set -# CONFIG_MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL is not set -CONFIG_MACH_NO_WESTBRIDGE=3Dy -CONFIG_ATH6K_LEGACY=3Dm -CONFIG_AR600x_SD31_XXX=3Dy -# CONFIG_AR600x_WB31_XXX is not set -# CONFIG_AR600x_SD32_XXX is not set -# CONFIG_AR600x_CUSTOM_XXX is not set -CONFIG_ATH6KL_ENABLE_COEXISTENCE=3Dy -CONFIG_AR600x_DUAL_ANTENNA=3Dy -# CONFIG_AR600x_SINGLE_ANTENNA is not set -# CONFIG_AR600x_BT_QCOM is not set -# CONFIG_AR600x_BT_CSR is not set -CONFIG_AR600x_BT_AR3001=3Dy -CONFIG_ATH6KL_HCI_BRIDGE=3Dy -# CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET is not set -CONFIG_ATH6KL_HTC_RAW_INTERFACE=3Dy -# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set -# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set -# CONFIG_ATH6KL_DEBUG is not set CONFIG_USB_ENESTORAGE=3Dm # CONFIG_BCM_WIMAX is not set # CONFIG_FT1000 is not set @@ -3259,13 +3380,18 @@ CONFIG_USB_ENESTORAGE=3Dm # CONFIG_SPEAKUP is not set # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set +# CONFIG_STAGING_MEDIA is not set +CONFIG_CLKDEV_LOOKUP=3Dy +CONFIG_HWSPINLOCK=3Dm =20 # -# Altera FPGA firmware download module +# Hardware Spinlock drivers # -# CONFIG_ALTERA_STAPL is not set -CONFIG_CLKDEV_LOOKUP=3Dy -# CONFIG_HWSPINLOCK is not set +CONFIG_HWSPINLOCK_OMAP=3Dm +CONFIG_CLKSRC_MMIO=3Dy +# CONFIG_IOMMU_SUPPORT is not set +# CONFIG_VIRT_DRIVERS is not set +# CONFIG_PM_DEVFREQ is not set =20 # # File systems @@ -3419,7 +3545,6 @@ CONFIG_NFS_V4=3Dy CONFIG_NFS_USE_KERNEL_DNS=3Dy # CONFIG_NFS_USE_NEW_IDMAPPER is not set CONFIG_NFSD=3Dm -CONFIG_NFSD_DEPRECATED=3Dy CONFIG_NFSD_V2_ACL=3Dy CONFIG_NFSD_V3=3Dy CONFIG_NFSD_V3_ACL=3Dy @@ -3547,7 +3672,7 @@ CONFIG_TIMER_STATS=3Dy # CONFIG_PROVE_LOCKING is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_KOBJECT is not set @@ -3592,12 +3717,12 @@ CONFIG_HAVE_ARCH_KGDB=3Dy # CONFIG_ARM_UNWIND is not set # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_LL is not set -# CONFIG_OC_ETM is not set =20 # # Security options # CONFIG_KEYS=3Dy +# CONFIG_ENCRYPTED_KEYS is not set # CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set # CONFIG_SECURITY is not set @@ -3629,6 +3754,7 @@ CONFIG_CRYPTO_PCOMP=3Dm CONFIG_CRYPTO_PCOMP2=3Dy CONFIG_CRYPTO_MANAGER=3Dy CONFIG_CRYPTO_MANAGER2=3Dy +CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=3Dy CONFIG_CRYPTO_GF128MUL=3Dm # CONFIG_CRYPTO_NULL is not set @@ -3688,6 +3814,7 @@ CONFIG_CRYPTO_AES=3Dm CONFIG_CRYPTO_ANUBIS=3Dm CONFIG_CRYPTO_ARC4=3Dm CONFIG_CRYPTO_BLOWFISH=3Dm +CONFIG_CRYPTO_BLOWFISH_COMMON=3Dm CONFIG_CRYPTO_CAMELLIA=3Dm CONFIG_CRYPTO_CAST5=3Dm CONFIG_CRYPTO_CAST6=3Dm @@ -3732,10 +3859,11 @@ CONFIG_CRC_ITU_T=3Dm CONFIG_CRC32=3Dy CONFIG_CRC7=3Dm CONFIG_LIBCRC32C=3Dm +CONFIG_CRC8=3Dm CONFIG_AUDIT_GENERIC=3Dy CONFIG_ZLIB_INFLATE=3Dy CONFIG_ZLIB_DEFLATE=3Dy -CONFIG_LZO_COMPRESS=3Dm +CONFIG_LZO_COMPRESS=3Dy CONFIG_LZO_DECOMPRESS=3Dy CONFIG_XZ_DEC=3Dy CONFIG_XZ_DEC_X86=3Dy @@ -3762,3 +3890,4 @@ CONFIG_CPU_RMAP=3Dy CONFIG_NLATTR=3Dy CONFIG_GENERIC_ATOMIC64=3Dy CONFIG_AVERAGE=3Dy +CONFIG_CORDIC=3Dm diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/= kernel.config.armv5tel-ipfire-rpi index b8bf4fc..c5a9062 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -1,9 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 2.6.41.10 Kernel Configuration +# Linux/arm 2.6.42.18 Kernel Configuration # CONFIG_ARM=3Dy CONFIG_SYS_SUPPORTS_APM_EMULATION=3Dy +CONFIG_HAVE_SCHED_CLOCK=3Dy CONFIG_GENERIC_GPIO=3Dy # CONFIG_ARCH_USES_GETTIMEOFFSET is not set CONFIG_GENERIC_CLOCKEVENTS=3Dy @@ -21,7 +22,9 @@ CONFIG_GENERIC_HWEIGHT=3Dy CONFIG_GENERIC_CALIBRATE_DELAY=3Dy CONFIG_NEED_DMA_MAP_STATE=3Dy CONFIG_VECTORS_BASE=3D0xffff0000 -# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_ARM_PATCH_PHYS_VIRT=3Dy +CONFIG_NEED_MACH_MEMORY_H=3Dy +CONFIG_GENERIC_BUG=3Dy CONFIG_DEFCONFIG_LIST=3D"/lib/modules/$UNAME_RELEASE/.config" CONFIG_HAVE_IRQ_WORK=3Dy =20 @@ -89,7 +92,7 @@ CONFIG_RD_BZIP2=3Dy CONFIG_RD_LZMA=3Dy CONFIG_RD_XZ=3Dy CONFIG_RD_LZO=3Dy -CONFIG_CC_OPTIMIZE_FOR_SIZE=3Dy +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=3Dy CONFIG_ANON_INODES=3Dy CONFIG_EXPERT=3Dy @@ -149,7 +152,7 @@ CONFIG_MODULE_FORCE_UNLOAD=3Dy CONFIG_BLOCK=3Dy CONFIG_LBDAF=3Dy CONFIG_BLK_DEV_BSG=3Dy -# CONFIG_BLK_DEV_BSGLIB is not set +CONFIG_BLK_DEV_BSGLIB=3Dy # CONFIG_BLK_DEV_INTEGRITY is not set =20 # @@ -203,6 +206,7 @@ CONFIG_MMU=3Dy # CONFIG_ARCH_VEXPRESS is not set # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CNS3XXX is not set # CONFIG_ARCH_GEMINI is not set @@ -228,8 +232,8 @@ CONFIG_MMU=3Dy # CONFIG_ARCH_MMP is not set # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_NUC93X is not set # CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_PICOXCELL is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_MSM is not set @@ -241,7 +245,7 @@ CONFIG_MMU=3Dy # CONFIG_ARCH_S5P64X0 is not set # CONFIG_ARCH_S5PC100 is not set # CONFIG_ARCH_S5PV210 is not set -# CONFIG_ARCH_EXYNOS4 is not set +# CONFIG_ARCH_EXYNOS is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_TCC_926 is not set # CONFIG_ARCH_U300 is not set @@ -293,8 +297,10 @@ CONFIG_ARM_THUMB=3Dy CONFIG_ARM_L1_CACHE_SHIFT=3D5 CONFIG_ARM_DMA_MEM_BUFFERABLE=3Dy CONFIG_CPU_HAS_PMU=3Dy +# CONFIG_ARM_ERRATA_326103 is not set CONFIG_ARM_ERRATA_411920=3Dy # CONFIG_ARM_ERRATA_364296 is not set +CONFIG_PL330=3Dy =20 # # Bus support @@ -353,6 +359,7 @@ CONFIG_UACCESS_WITH_MEMCPY=3Dy CONFIG_USE_OF=3Dy CONFIG_ZBOOT_ROM_TEXT=3D0x0 CONFIG_ZBOOT_ROM_BSS=3D0x0 +# CONFIG_ARM_APPENDED_DTB is not set CONFIG_CMDLINE=3D"dwc_otg.lpm_enable=3D0 console=3Dtty1 kgdboc=3DttyAMA0,115= 200 root=3D/dev/mmcblk0p3 rootwait ro" CONFIG_CMDLINE_FROM_BOOTLOADER=3Dy # CONFIG_CMDLINE_EXTEND is not set @@ -398,7 +405,9 @@ CONFIG_PM=3Dy # CONFIG_PM_DEBUG is not set # CONFIG_APM_EMULATION is not set CONFIG_PM_CLK=3Dy +CONFIG_CPU_PM=3Dy CONFIG_ARCH_SUSPEND_POSSIBLE=3Dy +CONFIG_ARM_CPU_SUSPEND=3Dy CONFIG_NET=3Dy =20 # @@ -765,6 +774,7 @@ CONFIG_LLC=3Dm # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set CONFIG_IEEE802154=3Dm +CONFIG_IEEE802154_6LOWPAN=3Dm CONFIG_NET_SCHED=3Dy =20 # @@ -941,6 +951,7 @@ CONFIG_CAIF=3Dm CONFIG_CAIF_NETDEV=3Dm CONFIG_CEPH_LIB=3Dm # CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set # CONFIG_NFC is not set =20 # @@ -962,11 +973,10 @@ CONFIG_EXTRA_FIRMWARE=3D"" # CONFIG_SYS_HYPERVISOR is not set CONFIG_CONNECTOR=3Dm CONFIG_MTD=3Dm -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_TESTS=3Dm +# CONFIG_MTD_TESTS is not set # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_AFS_PARTS is not set -CONFIG_MTD_OF_PARTS=3Dy +CONFIG_MTD_OF_PARTS=3Dm CONFIG_MTD_AR7_PARTS=3Dm =20 # @@ -1029,6 +1039,7 @@ CONFIG_MTD_PHYSMAP=3Dm # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_DOCG3 is not set CONFIG_MTD_NAND_ECC=3Dm # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND is not set @@ -1082,6 +1093,7 @@ CONFIG_MG_DISK_RES=3D0 # CONFIG_SENSORS_LIS3LV02D is not set CONFIG_MISC_DEVICES=3Dy # CONFIG_AD525X_DPOT is not set +# CONFIG_ATMEL_PWM is not set # CONFIG_ICS932S401 is not set CONFIG_ENCLOSURE_SERVICES=3Dm # CONFIG_APDS9802ALS is not set @@ -1117,9 +1129,12 @@ CONFIG_IWMC3200TOP=3Dm CONFIG_TI_ST=3Dm # CONFIG_SENSORS_LIS3_SPI is not set # CONFIG_SENSORS_LIS3_I2C is not set + +# +# Altera FPGA firmware download module +# +# CONFIG_ALTERA_STAPL is not set CONFIG_BCM2708_VCHIQ=3Dy -CONFIG_HAVE_IDE=3Dy -# CONFIG_IDE is not set =20 # # SCSI device support @@ -1202,6 +1217,7 @@ CONFIG_SATA_MV=3Dm # PIO-only SFF controllers # CONFIG_PATA_PLATFORM=3Dm +CONFIG_PATA_OF_PLATFORM=3Dm =20 # # Generic fallback / legacy drivers @@ -1217,8 +1233,13 @@ CONFIG_MD_MULTIPATH=3Dm # CONFIG_MD_FAULTY is not set CONFIG_BLK_DEV_DM=3Dm # CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=3Dm +CONFIG_DM_PERSISTENT_DATA=3Dm CONFIG_DM_CRYPT=3Dm CONFIG_DM_SNAPSHOT=3Dm +CONFIG_DM_THIN_PROVISIONING=3Dm +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +# CONFIG_DM_DEBUG_SPACE_MAPS is not set CONFIG_DM_MIRROR=3Dm CONFIG_DM_RAID=3Dm CONFIG_DM_LOG_USERSPACE=3Dm @@ -1231,11 +1252,9 @@ CONFIG_DM_UEVENT=3Dy CONFIG_DM_FLAKEY=3Dm # CONFIG_TARGET_CORE is not set CONFIG_NETDEVICES=3Dy -CONFIG_IFB=3Dm -CONFIG_DUMMY=3Dm +CONFIG_NET_CORE=3Dy CONFIG_BONDING=3Dm -CONFIG_MACVLAN=3Dm -CONFIG_MACVTAP=3Dm +CONFIG_DUMMY=3Dm CONFIG_EQUALIZER=3Dm CONFIG_IMQ=3Dm # CONFIG_IMQ_BEHAVIOR_AA is not set @@ -1243,9 +1262,62 @@ CONFIG_IMQ_BEHAVIOR_AB=3Dy # CONFIG_IMQ_BEHAVIOR_BA is not set # CONFIG_IMQ_BEHAVIOR_BB is not set CONFIG_IMQ_NUM_DEVS=3D2 +CONFIG_MII=3Dm +# CONFIG_IEEE802154_DRIVERS is not set +CONFIG_IFB=3Dm +CONFIG_MACVLAN=3Dm +CONFIG_MACVTAP=3Dm +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set CONFIG_TUN=3Dm CONFIG_VETH=3Dm -CONFIG_MII=3Dm +CONFIG_ATM_DRIVERS=3Dy +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=3Dm + +# +# CAIF transport drivers +# +# CONFIG_CAIF_TTY is not set +# CONFIG_CAIF_SPI_SLAVE is not set +# CONFIG_CAIF_HSI is not set +CONFIG_ETHERNET=3Dy +CONFIG_NET_VENDOR_BROADCOM=3Dy +CONFIG_B44=3Dm +CONFIG_NET_VENDOR_CHELSIO=3Dy +CONFIG_DM9000=3Dm +# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set +CONFIG_DNET=3Dm +CONFIG_NET_VENDOR_FARADAY=3Dy +# CONFIG_FTMAC100 is not set +# CONFIG_FTGMAC100 is not set +CONFIG_NET_VENDOR_INTEL=3Dy +CONFIG_NET_VENDOR_I825XX=3Dy +CONFIG_NET_VENDOR_MARVELL=3Dy +CONFIG_NET_VENDOR_MICREL=3Dy +# CONFIG_KS8842 is not set +# CONFIG_KS8851 is not set +CONFIG_KS8851_MLL=3Dm +CONFIG_NET_VENDOR_MICROCHIP=3Dy +# CONFIG_ENC28J60 is not set +CONFIG_NET_VENDOR_NATSEMI=3Dy +CONFIG_NET_VENDOR_8390=3Dy +CONFIG_AX88796=3Dm +# CONFIG_AX88796_93CX6 is not set +CONFIG_ETHOC=3Dm +CONFIG_NET_VENDOR_SEEQ=3Dy +CONFIG_SEEQ8005=3Dm +CONFIG_NET_VENDOR_SMSC=3Dy +CONFIG_SMC91X=3Dm +CONFIG_SMC911X=3Dm +CONFIG_SMSC911X=3Dm +# CONFIG_SMSC911X_ARCH_HOOKS is not set +CONFIG_NET_VENDOR_STMICRO=3Dy +CONFIG_STMMAC_ETH=3Dm +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_RING=3Dy +# CONFIG_STMMAC_CHAINED is not set CONFIG_PHYLIB=3Dy =20 # @@ -1268,37 +1340,59 @@ CONFIG_MICREL_PHY=3Dm # CONFIG_FIXED_PHY is not set CONFIG_MDIO_BITBANG=3Dm # CONFIG_MDIO_GPIO is not set -CONFIG_NET_ETHERNET=3Dy -CONFIG_AX88796=3Dm -# CONFIG_AX88796_93CX6 is not set -CONFIG_SMC91X=3Dm -CONFIG_DM9000=3Dm -CONFIG_DM9000_DEBUGLEVEL=3D4 -# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set -# CONFIG_ENC28J60 is not set -CONFIG_ETHOC=3Dm -CONFIG_SMC911X=3Dm -CONFIG_SMSC911X=3Dm -# CONFIG_SMSC911X_ARCH_HOOKS is not set -CONFIG_DNET=3Dm -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -CONFIG_B44=3Dm -# CONFIG_KS8842 is not set -# CONFIG_KS8851 is not set -CONFIG_KS8851_MLL=3Dm -# CONFIG_FTMAC100 is not set -CONFIG_NETDEV_1000=3Dy -CONFIG_STMMAC_ETH=3Dm -# CONFIG_STMMAC_DA is not set -# CONFIG_STMMAC_DUAL_MAC is not set -# CONFIG_FTGMAC100 is not set -CONFIG_NETDEV_10000=3Dy +CONFIG_PPP=3Dm +CONFIG_PPP_BSDCOMP=3Dm +CONFIG_PPP_DEFLATE=3Dm +CONFIG_PPP_FILTER=3Dy +CONFIG_PPP_MPPE=3Dm +CONFIG_PPP_MULTILINK=3Dy +CONFIG_PPPOATM=3Dm +CONFIG_PPPOE=3Dm +CONFIG_PPTP=3Dm +CONFIG_PPPOL2TP=3Dm +CONFIG_PPP_ASYNC=3Dm +CONFIG_PPP_SYNC_TTY=3Dm +CONFIG_SLIP=3Dm +CONFIG_SLHC=3Dm +CONFIG_SLIP_COMPRESSED=3Dy +CONFIG_SLIP_SMART=3Dy +CONFIG_SLIP_MODE_SLIP6=3Dy + +# +# USB Network Adapters +# +CONFIG_USB_CATC=3Dm +CONFIG_USB_KAWETH=3Dm +CONFIG_USB_PEGASUS=3Dm +CONFIG_USB_RTL8150=3Dm +CONFIG_USB_USBNET=3Dm +CONFIG_USB_NET_AX8817X=3Dm +CONFIG_USB_NET_CDCETHER=3Dm +CONFIG_USB_NET_CDC_EEM=3Dm +CONFIG_USB_NET_CDC_NCM=3Dm +CONFIG_USB_NET_DM9601=3Dm +CONFIG_USB_NET_SMSC75XX=3Dm +CONFIG_USB_NET_SMSC95XX=3Dm +CONFIG_USB_NET_GL620A=3Dm +CONFIG_USB_NET_NET1080=3Dm +CONFIG_USB_NET_PLUSB=3Dm +CONFIG_USB_NET_MCS7830=3Dm +CONFIG_USB_NET_RNDIS_HOST=3Dm +CONFIG_USB_NET_CDC_SUBSET=3Dm +CONFIG_USB_ALI_M5632=3Dy +CONFIG_USB_AN2720=3Dy +CONFIG_USB_BELKIN=3Dy +CONFIG_USB_ARMLINUX=3Dy +# CONFIG_USB_EPSON2888 is not set +CONFIG_USB_KC2190=3Dy +CONFIG_USB_NET_ZAURUS=3Dm +CONFIG_USB_NET_CX82310_ETH=3Dm +CONFIG_USB_NET_KALMIA=3Dm +CONFIG_USB_HSO=3Dm +CONFIG_USB_NET_INT51X1=3Dm +CONFIG_USB_IPHETH=3Dm +CONFIG_USB_SIERRA_NET=3Dm +CONFIG_USB_VL600=3Dm CONFIG_WLAN=3Dy CONFIG_LIBERTAS_THINFIRM=3Dm # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set @@ -1320,6 +1414,9 @@ CONFIG_ATH9K_HTC=3Dm CONFIG_CARL9170=3Dm CONFIG_CARL9170_LEDS=3Dy CONFIG_CARL9170_WPC=3Dy +CONFIG_CARL9170_HWRNG=3Dy +CONFIG_ATH6KL=3Dm +# CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=3Dm CONFIG_B43_BCMA=3Dy CONFIG_B43_SSB=3Dy @@ -1328,6 +1425,7 @@ CONFIG_B43_BCMA_PIO=3Dy CONFIG_B43_PIO=3Dy CONFIG_B43_PHY_N=3Dy CONFIG_B43_PHY_LP=3Dy +CONFIG_B43_PHY_HT=3Dy CONFIG_B43_LEDS=3Dy CONFIG_B43_HWRNG=3Dy # CONFIG_B43_DEBUG is not set @@ -1340,6 +1438,9 @@ CONFIG_B43LEGACY_PIO=3Dy CONFIG_B43LEGACY_DMA_AND_PIO_MODE=3Dy # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=3Dm +CONFIG_BRCMFMAC=3Dm +# CONFIG_BRCMDBG is not set CONFIG_HOSTAP=3Dm CONFIG_HOSTAP_FIRMWARE=3Dy # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set @@ -1369,8 +1470,6 @@ CONFIG_RT2X00_LIB_FIRMWARE=3Dy CONFIG_RT2X00_LIB_CRYPTO=3Dy CONFIG_RT2X00_LIB_LEDS=3Dy # CONFIG_RT2X00_DEBUG is not set -CONFIG_RTL8192SE=3Dm -CONFIG_RTL8192DE=3Dm CONFIG_RTL8192CU=3Dm CONFIG_RTLWIFI=3Dm CONFIG_RTL8192C_COMMON=3Dm @@ -1379,7 +1478,6 @@ CONFIG_WL1251=3Dm CONFIG_WL1251_SDIO=3Dm CONFIG_WL12XX_MENU=3Dm CONFIG_WL12XX=3Dm -# CONFIG_WL12XX_HT is not set # CONFIG_WL12XX_SPI is not set CONFIG_WL12XX_SDIO=3Dm CONFIG_WL12XX_SDIO_TEST=3Dm @@ -1392,42 +1490,6 @@ CONFIG_MWIFIEX_SDIO=3Dm # # Enable WiMAX (Networking options) to see the WiMAX drivers # - -# -# USB Network Adapters -# -CONFIG_USB_CATC=3Dm -CONFIG_USB_KAWETH=3Dm -CONFIG_USB_PEGASUS=3Dm -CONFIG_USB_RTL8150=3Dm -CONFIG_USB_USBNET=3Dm -CONFIG_USB_NET_AX8817X=3Dm -CONFIG_USB_NET_CDCETHER=3Dm -CONFIG_USB_NET_CDC_EEM=3Dm -CONFIG_USB_NET_CDC_NCM=3Dm -CONFIG_USB_NET_DM9601=3Dm -CONFIG_USB_NET_SMSC75XX=3Dm -CONFIG_USB_NET_SMSC95XX=3Dm -CONFIG_USB_NET_GL620A=3Dm -CONFIG_USB_NET_NET1080=3Dm -CONFIG_USB_NET_PLUSB=3Dm -CONFIG_USB_NET_MCS7830=3Dm -CONFIG_USB_NET_RNDIS_HOST=3Dm -CONFIG_USB_NET_CDC_SUBSET=3Dm -CONFIG_USB_ALI_M5632=3Dy -CONFIG_USB_AN2720=3Dy -CONFIG_USB_BELKIN=3Dy -CONFIG_USB_ARMLINUX=3Dy -# CONFIG_USB_EPSON2888 is not set -CONFIG_USB_KC2190=3Dy -CONFIG_USB_NET_ZAURUS=3Dm -CONFIG_USB_NET_CX82310_ETH=3Dm -CONFIG_USB_NET_KALMIA=3Dm -CONFIG_USB_HSO=3Dm -CONFIG_USB_NET_INT51X1=3Dm -CONFIG_USB_IPHETH=3Dm -CONFIG_USB_SIERRA_NET=3Dm -CONFIG_USB_VL600=3Dm CONFIG_WAN=3Dy CONFIG_HDLC=3Dm CONFIG_HDLC_RAW=3Dm @@ -1441,37 +1503,6 @@ CONFIG_HDLC_PPP=3Dm # CONFIG_DLCI=3Dm CONFIG_DLCI_MAX=3D8 -CONFIG_ATM_DRIVERS=3Dy -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_TCP=3Dm -# CONFIG_IEEE802154_DRIVERS is not set - -# -# CAIF transport drivers -# -# CONFIG_CAIF_TTY is not set -# CONFIG_CAIF_SPI_SLAVE is not set -# CONFIG_CAIF_HSI is not set -CONFIG_PPP=3Dm -CONFIG_PPP_MULTILINK=3Dy -CONFIG_PPP_FILTER=3Dy -CONFIG_PPP_ASYNC=3Dm -CONFIG_PPP_SYNC_TTY=3Dm -CONFIG_PPP_DEFLATE=3Dm -CONFIG_PPP_BSDCOMP=3Dm -CONFIG_PPP_MPPE=3Dm -CONFIG_PPPOE=3Dm -CONFIG_PPTP=3Dm -CONFIG_PPPOATM=3Dm -CONFIG_PPPOL2TP=3Dm -CONFIG_SLIP=3Dm -CONFIG_SLIP_COMPRESSED=3Dy -CONFIG_SLHC=3Dm -CONFIG_SLIP_SMART=3Dy -CONFIG_SLIP_MODE_SLIP6=3Dy -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set CONFIG_ISDN=3Dy # CONFIG_ISDN_I4L is not set # CONFIG_ISDN_CAPI is not set @@ -1519,12 +1550,10 @@ CONFIG_INPUT_EVDEV=3Dm # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=3Dy -CONFIG_INPUT_AD714X=3Dm -CONFIG_INPUT_AD714X_I2C=3Dm -CONFIG_INPUT_AD714X_SPI=3Dm +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_MMA8450 is not set # CONFIG_INPUT_MPU3050 is not set -CONFIG_INPUT_ATI_REMOTE=3Dm CONFIG_INPUT_ATI_REMOTE2=3Dm CONFIG_INPUT_KEYSPAN_REMOTE=3Dm # CONFIG_INPUT_KXTJ9 is not set @@ -1533,12 +1562,9 @@ CONFIG_INPUT_YEALINK=3Dm CONFIG_INPUT_CM109=3Dm CONFIG_INPUT_UINPUT=3Dm # CONFIG_INPUT_PCF8574 is not set -CONFIG_INPUT_GPIO_ROTARY_ENCODER=3Dm -CONFIG_INPUT_ADXL34X=3Dm -CONFIG_INPUT_ADXL34X_I2C=3Dm -CONFIG_INPUT_ADXL34X_SPI=3Dm -CONFIG_INPUT_CMA3000=3Dm -# CONFIG_INPUT_CMA3000_I2C is not set +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_CMA3000 is not set =20 # # Hardware I/O ports @@ -1560,6 +1586,7 @@ CONFIG_GAMEPORT_L4=3Dm CONFIG_VT=3Dy CONFIG_CONSOLE_TRANSLATIONS=3Dy CONFIG_VT_CONSOLE=3Dy +CONFIG_VT_CONSOLE_SLEEP=3Dy CONFIG_HW_CONSOLE=3Dy CONFIG_VT_HW_CONSOLE_BINDING=3Dy CONFIG_UNIX98_PTYS=3Dy @@ -1624,7 +1651,8 @@ CONFIG_I2C_ALGOPCA=3Dm # # I2C system bus drivers (mostly embedded / system-on-chip) # -CONFIG_I2C_DESIGNWARE=3Dm +CONFIG_I2C_BCM2708=3Dm +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set CONFIG_I2C_GPIO=3Dm CONFIG_I2C_OCORES=3Dm CONFIG_I2C_PCA_PLATFORM=3Dm @@ -1654,21 +1682,21 @@ CONFIG_SPI_MASTER=3Dy # # SPI Master Controller Drivers # -CONFIG_SPI_ALTERA=3Dm +# CONFIG_SPI_ALTERA is not set +CONFIG_SPI_BCM2708=3Dm CONFIG_SPI_BITBANG=3Dm CONFIG_SPI_GPIO=3Dm -CONFIG_SPI_OC_TINY=3Dm -CONFIG_SPI_PL022=3Dm +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PL022 is not set # CONFIG_SPI_PXA2XX_PCI is not set # CONFIG_SPI_XILINX is not set -CONFIG_SPI_DESIGNWARE=3Dm -CONFIG_SPI_DW_MMIO=3Dm +# CONFIG_SPI_DESIGNWARE is not set =20 # # SPI Protocol Masters # CONFIG_SPI_SPIDEV=3Dm -CONFIG_SPI_TLE62X0=3Dm +# CONFIG_SPI_TLE62X0 is not set =20 # # PPS support @@ -1733,7 +1761,7 @@ CONFIG_W1_CON=3Dy # CONFIG_W1_MASTER_DS2490=3Dm CONFIG_W1_MASTER_DS2482=3Dm -CONFIG_W1_MASTER_DS1WM=3Dm +# CONFIG_W1_MASTER_DS1WM is not set CONFIG_W1_MASTER_GPIO=3Dm =20 # @@ -1757,6 +1785,7 @@ CONFIG_HWMON_VID=3Dm # # Native drivers # +CONFIG_SENSORS_AD7314=3Dm CONFIG_SENSORS_AD7414=3Dm CONFIG_SENSORS_AD7418=3Dm CONFIG_SENSORS_ADCXX=3Dm @@ -1818,11 +1847,13 @@ CONFIG_PMBUS=3Dm CONFIG_SENSORS_PMBUS=3Dm CONFIG_SENSORS_ADM1275=3Dm CONFIG_SENSORS_LM25066=3Dm +CONFIG_SENSORS_LTC2978=3Dm CONFIG_SENSORS_MAX16064=3Dm CONFIG_SENSORS_MAX34440=3Dm CONFIG_SENSORS_MAX8688=3Dm CONFIG_SENSORS_UCD9000=3Dm CONFIG_SENSORS_UCD9200=3Dm +CONFIG_SENSORS_ZL6100=3Dm CONFIG_SENSORS_SHT15=3Dm CONFIG_SENSORS_SHT21=3Dm CONFIG_SENSORS_SMM665=3Dm @@ -1864,7 +1895,7 @@ CONFIG_WATCHDOG=3Dy # # Watchdog Device Drivers # -# CONFIG_SOFT_WATCHDOG is not set +CONFIG_SOFT_WATCHDOG=3Dm # CONFIG_ARM_SP805_WATCHDOG is not set # CONFIG_DW_WATCHDOG is not set # CONFIG_MAX63XX_WATCHDOG is not set @@ -1873,7 +1904,7 @@ CONFIG_BCM2708_WDT=3Dm # # USB-based Watchdog Cards # -# CONFIG_USBPCWATCHDOG is not set +CONFIG_USBPCWATCHDOG=3Dm CONFIG_SSB_POSSIBLE=3Dy =20 # @@ -1893,13 +1924,15 @@ CONFIG_BCMA_POSSIBLE=3Dy CONFIG_BCMA=3Dm CONFIG_BCMA_BLOCKIO=3Dy # CONFIG_BCMA_DEBUG is not set -CONFIG_MFD_SUPPORT=3Dy + +# +# Multifunction device drivers +# # CONFIG_MFD_CORE is not set # CONFIG_MFD_SM501 is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_HTC_EGPIO is not set # CONFIG_HTC_PASIC3 is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_TPS6105X is not set # CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set @@ -1942,6 +1975,7 @@ CONFIG_IR_SONY_DECODER=3Dm CONFIG_IR_RC5_SZ_DECODER=3Dm CONFIG_IR_MCE_KBD_DECODER=3Dm CONFIG_IR_LIRC_CODEC=3Dm +CONFIG_RC_ATI_REMOTE=3Dm CONFIG_IR_IMON=3Dm CONFIG_IR_MCEUSB=3Dm CONFIG_IR_REDRAT3=3Dm @@ -1973,6 +2007,7 @@ CONFIG_MEDIA_TUNER_TDA18212=3Dm CONFIG_VIDEO_V4L2=3Dm CONFIG_VIDEOBUF_GEN=3Dm CONFIG_VIDEOBUF_VMALLOC=3Dm +CONFIG_VIDEOBUF_DMA_CONTIG=3Dm CONFIG_VIDEOBUF_DVB=3Dm CONFIG_VIDEO_TVEEPROM=3Dm CONFIG_VIDEO_TUNER=3Dm @@ -2014,7 +2049,7 @@ CONFIG_VIDEO_WM8775=3Dm # # Video decoders # -# CONFIG_VIDEO_ADV7180 is not set +CONFIG_VIDEO_ADV7180=3Dm # CONFIG_VIDEO_BT819 is not set # CONFIG_VIDEO_BT856 is not set # CONFIG_VIDEO_BT866 is not set @@ -2054,6 +2089,7 @@ CONFIG_VIDEO_CX2341X=3Dm # CONFIG_VIDEO_OV7670 is not set # CONFIG_VIDEO_MT9V011 is not set # CONFIG_VIDEO_TCM825X is not set +CONFIG_VIDEO_SR030PC30=3Dm =20 # # Flash devices @@ -2072,10 +2108,8 @@ CONFIG_VIDEO_CX2341X=3Dm # CONFIG_VIDEO_M52790 is not set # CONFIG_VIDEO_VIVI is not set CONFIG_VIDEO_CPIA2=3Dm -# CONFIG_VIDEO_TIMBERDALE is not set +CONFIG_VIDEO_TIMBERDALE=3Dm CONFIG_VIDEO_AU0828=3Dm -CONFIG_VIDEO_SR030PC30=3Dm -CONFIG_VIDEO_NOON010PC30=3Dm CONFIG_SOC_CAMERA=3Dm CONFIG_SOC_CAMERA_IMX074=3Dm CONFIG_SOC_CAMERA_MT9M001=3Dm @@ -2098,50 +2132,51 @@ CONFIG_V4L_USB_DRIVERS=3Dy CONFIG_USB_VIDEO_CLASS=3Dm CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=3Dy CONFIG_USB_GSPCA=3Dm -# CONFIG_USB_M5602 is not set -# CONFIG_USB_STV06XX is not set -# CONFIG_USB_GL860 is not set -# CONFIG_USB_GSPCA_BENQ is not set -# CONFIG_USB_GSPCA_CONEX is not set -# CONFIG_USB_GSPCA_CPIA1 is not set -# CONFIG_USB_GSPCA_ETOMS is not set -# CONFIG_USB_GSPCA_FINEPIX is not set -# CONFIG_USB_GSPCA_JEILINJ is not set -# CONFIG_USB_GSPCA_KINECT is not set -# CONFIG_USB_GSPCA_KONICA is not set -# CONFIG_USB_GSPCA_MARS is not set -# CONFIG_USB_GSPCA_MR97310A is not set -# CONFIG_USB_GSPCA_NW80X is not set -# CONFIG_USB_GSPCA_OV519 is not set -# CONFIG_USB_GSPCA_OV534 is not set -# CONFIG_USB_GSPCA_OV534_9 is not set -# CONFIG_USB_GSPCA_PAC207 is not set -# CONFIG_USB_GSPCA_PAC7302 is not set -# CONFIG_USB_GSPCA_PAC7311 is not set -# CONFIG_USB_GSPCA_SE401 is not set -# CONFIG_USB_GSPCA_SN9C2028 is not set -# CONFIG_USB_GSPCA_SN9C20X is not set -# CONFIG_USB_GSPCA_SONIXB is not set -# CONFIG_USB_GSPCA_SONIXJ is not set -# CONFIG_USB_GSPCA_SPCA500 is not set -# CONFIG_USB_GSPCA_SPCA501 is not set -# CONFIG_USB_GSPCA_SPCA505 is not set -# CONFIG_USB_GSPCA_SPCA506 is not set -# CONFIG_USB_GSPCA_SPCA508 is not set -# CONFIG_USB_GSPCA_SPCA561 is not set -# CONFIG_USB_GSPCA_SPCA1528 is not set -# CONFIG_USB_GSPCA_SQ905 is not set -# CONFIG_USB_GSPCA_SQ905C is not set -# CONFIG_USB_GSPCA_SQ930X is not set -# CONFIG_USB_GSPCA_STK014 is not set -# CONFIG_USB_GSPCA_STV0680 is not set -# CONFIG_USB_GSPCA_SUNPLUS is not set -# CONFIG_USB_GSPCA_T613 is not set -# CONFIG_USB_GSPCA_TV8532 is not set -# CONFIG_USB_GSPCA_VC032X is not set -# CONFIG_USB_GSPCA_VICAM is not set -# CONFIG_USB_GSPCA_XIRLINK_CIT is not set -# CONFIG_USB_GSPCA_ZC3XX is not set +CONFIG_USB_M5602=3Dm +CONFIG_USB_STV06XX=3Dm +CONFIG_USB_GL860=3Dm +CONFIG_USB_GSPCA_BENQ=3Dm +CONFIG_USB_GSPCA_CONEX=3Dm +CONFIG_USB_GSPCA_CPIA1=3Dm +CONFIG_USB_GSPCA_ETOMS=3Dm +CONFIG_USB_GSPCA_FINEPIX=3Dm +CONFIG_USB_GSPCA_JEILINJ=3Dm +CONFIG_USB_GSPCA_KINECT=3Dm +CONFIG_USB_GSPCA_KONICA=3Dm +CONFIG_USB_GSPCA_MARS=3Dm +CONFIG_USB_GSPCA_MR97310A=3Dm +CONFIG_USB_GSPCA_NW80X=3Dm +CONFIG_USB_GSPCA_OV519=3Dm +CONFIG_USB_GSPCA_OV534=3Dm +CONFIG_USB_GSPCA_OV534_9=3Dm +CONFIG_USB_GSPCA_PAC207=3Dm +CONFIG_USB_GSPCA_PAC7302=3Dm +CONFIG_USB_GSPCA_PAC7311=3Dm +CONFIG_USB_GSPCA_SE401=3Dm +CONFIG_USB_GSPCA_SN9C2028=3Dm +CONFIG_USB_GSPCA_SN9C20X=3Dm +CONFIG_USB_GSPCA_SONIXB=3Dm +CONFIG_USB_GSPCA_SONIXJ=3Dm +CONFIG_USB_GSPCA_SPCA500=3Dm +CONFIG_USB_GSPCA_SPCA501=3Dm +CONFIG_USB_GSPCA_SPCA505=3Dm +CONFIG_USB_GSPCA_SPCA506=3Dm +CONFIG_USB_GSPCA_SPCA508=3Dm +CONFIG_USB_GSPCA_SPCA561=3Dm +CONFIG_USB_GSPCA_SPCA1528=3Dm +CONFIG_USB_GSPCA_SQ905=3Dm +CONFIG_USB_GSPCA_SQ905C=3Dm +CONFIG_USB_GSPCA_SQ930X=3Dm +CONFIG_USB_GSPCA_STK014=3Dm +CONFIG_USB_GSPCA_STV0680=3Dm +CONFIG_USB_GSPCA_SUNPLUS=3Dm +CONFIG_USB_GSPCA_T613=3Dm +CONFIG_USB_GSPCA_TOPRO=3Dm +CONFIG_USB_GSPCA_TV8532=3Dm +CONFIG_USB_GSPCA_VC032X=3Dm +CONFIG_USB_GSPCA_VICAM=3Dm +CONFIG_USB_GSPCA_XIRLINK_CIT=3Dm +CONFIG_USB_GSPCA_ZC3XX=3Dm CONFIG_VIDEO_PVRUSB2=3Dm CONFIG_VIDEO_PVRUSB2_SYSFS=3Dy CONFIG_VIDEO_PVRUSB2_DVB=3Dy @@ -2156,6 +2191,9 @@ CONFIG_VIDEO_CX231XX=3Dm CONFIG_VIDEO_CX231XX_RC=3Dy CONFIG_VIDEO_CX231XX_ALSA=3Dm CONFIG_VIDEO_CX231XX_DVB=3Dm +CONFIG_VIDEO_TM6000=3Dm +CONFIG_VIDEO_TM6000_ALSA=3Dm +CONFIG_VIDEO_TM6000_DVB=3Dm CONFIG_VIDEO_USBVISION=3Dm CONFIG_USB_ET61X251=3Dm CONFIG_USB_SN9C102=3Dm @@ -2170,7 +2208,7 @@ CONFIG_USB_S2255=3Dm CONFIG_DVB_MAX_ADAPTERS=3D8 # CONFIG_DVB_DYNAMIC_MINORS is not set CONFIG_DVB_CAPTURE_DRIVERS=3Dy -# CONFIG_TTPCI_EEPROM is not set +CONFIG_TTPCI_EEPROM=3Dm =20 # # Supported USB Adapters @@ -2197,6 +2235,7 @@ CONFIG_DVB_USB_DTT200U=3Dm CONFIG_DVB_USB_OPERA1=3Dm CONFIG_DVB_USB_AF9005=3Dm CONFIG_DVB_USB_AF9005_REMOTE=3Dm +CONFIG_DVB_USB_PCTV452E=3Dm CONFIG_DVB_USB_DW2102=3Dm CONFIG_DVB_USB_CINERGY_T2=3Dm CONFIG_DVB_USB_ANYSEE=3Dm @@ -2208,6 +2247,8 @@ CONFIG_DVB_USB_EC168=3Dm CONFIG_DVB_USB_AZ6027=3Dm CONFIG_DVB_USB_LME2510=3Dm CONFIG_DVB_USB_TECHNISAT_USB2=3Dm +CONFIG_DVB_USB_IT913X=3Dm +CONFIG_DVB_USB_MXL111SF=3Dm CONFIG_SMS_SIANO_MDTV=3Dm =20 # @@ -2261,6 +2302,7 @@ CONFIG_DVB_TDA826X=3Dm CONFIG_DVB_CX24116=3Dm CONFIG_DVB_SI21XX=3Dm CONFIG_DVB_DS3000=3Dm +CONFIG_DVB_TDA10071=3Dm =20 # # DVB-T (terrestrial) frontends @@ -2315,11 +2357,14 @@ CONFIG_DVB_TUNER_DIB0090=3Dm # SEC control devices for DVB-S # CONFIG_DVB_LNBP21=3Dm +CONFIG_DVB_LNBP22=3Dm CONFIG_DVB_ISL6421=3Dm CONFIG_DVB_ISL6423=3Dm +CONFIG_DVB_A8293=3Dm CONFIG_DVB_LGS8GXX=3Dm CONFIG_DVB_ATBM8830=3Dm CONFIG_DVB_IX2505V=3Dm +CONFIG_DVB_IT913X_FE=3Dm =20 # # Tools to develop new frontends @@ -2359,6 +2404,7 @@ CONFIG_FB_BCM2708=3Dy # CONFIG_FB_ARMCLCD is not set # CONFIG_FB_UVESA is not set # CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_SMSCUFX is not set # CONFIG_FB_UDL is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set @@ -2420,14 +2466,12 @@ CONFIG_SND_SUPPORT_OLD_API=3Dy CONFIG_SND_VERBOSE_PROCFS=3Dy # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=3Dy CONFIG_SND_RAWMIDI_SEQ=3Dm # CONFIG_SND_OPL3_LIB_SEQ is not set # CONFIG_SND_OPL4_LIB_SEQ is not set # CONFIG_SND_SBAWE_SEQ is not set # CONFIG_SND_EMU10K1_SEQ is not set CONFIG_SND_MPU401_UART=3Dm -CONFIG_SND_AC97_CODEC=3Dm CONFIG_SND_DRIVERS=3Dy CONFIG_SND_DUMMY=3Dm CONFIG_SND_ALOOP=3Dm @@ -2435,9 +2479,8 @@ CONFIG_SND_VIRMIDI=3Dm CONFIG_SND_MTPAV=3Dm CONFIG_SND_SERIAL_U16550=3Dm CONFIG_SND_MPU401=3Dm -# CONFIG_SND_AC97_POWER_SAVE is not set CONFIG_SND_ARM=3Dy -CONFIG_SND_ARMAACI=3Dm +# CONFIG_SND_ARMAACI is not set CONFIG_SND_BCM2835=3Dm CONFIG_SND_SPI=3Dy CONFIG_SND_USB=3Dy @@ -2448,7 +2491,6 @@ CONFIG_SND_USB_CAIAQ=3Dm CONFIG_SND_USB_6FIRE=3Dm # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=3Dm CONFIG_HID_SUPPORT=3Dy CONFIG_HID=3Dy # CONFIG_HIDRAW is not set @@ -2487,10 +2529,11 @@ CONFIG_HID_TWINHAN=3Dm CONFIG_HID_KENSINGTON=3Dm CONFIG_HID_LCPOWER=3Dm CONFIG_HID_LOGITECH=3Dm +CONFIG_HID_LOGITECH_DJ=3Dm # CONFIG_LOGITECH_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set # CONFIG_LOGIG940_FF is not set -# CONFIG_LOGIWII_FF is not set +# CONFIG_LOGIWHEELS_FF is not set CONFIG_HID_MICROSOFT=3Dm CONFIG_HID_MONTEREY=3Dm CONFIG_HID_MULTITOUCH=3Dm @@ -2504,6 +2547,7 @@ CONFIG_HID_PICOLCD=3Dm # CONFIG_HID_PICOLCD_BACKLIGHT is not set # CONFIG_HID_PICOLCD_LCD is not set # CONFIG_HID_PICOLCD_LEDS is not set +CONFIG_HID_PRIMAX=3Dm CONFIG_HID_QUANTA=3Dm CONFIG_HID_ROCCAT=3Dm CONFIG_HID_ROCCAT_COMMON=3Dm @@ -2527,9 +2571,11 @@ CONFIG_HID_ZEROPLUS=3Dm # CONFIG_ZEROPLUS_FF is not set CONFIG_HID_ZYDACRON=3Dm CONFIG_USB_SUPPORT=3Dy +CONFIG_USB_COMMON=3Dy CONFIG_USB_ARCH_HAS_HCD=3Dy # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB_ARCH_HAS_XHCI is not set CONFIG_USB=3Dy # CONFIG_USB_DEBUG is not set CONFIG_USB_ANNOUNCE_NEW_DEVICES=3Dy @@ -2544,6 +2590,7 @@ CONFIG_USB_SUSPEND=3Dy # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_DWC3 is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -2566,7 +2613,7 @@ CONFIG_USB_DWCOTG=3Dy # USB Device Class drivers # CONFIG_USB_ACM=3Dm -# CONFIG_USB_PRINTER is not set +CONFIG_USB_PRINTER=3Dm # CONFIG_USB_WDM is not set # CONFIG_USB_TMC is not set =20 @@ -2687,6 +2734,28 @@ CONFIG_USB_CXACRU=3Dm CONFIG_USB_UEAGLEATM=3Dm CONFIG_USB_XUSBATM=3Dm # CONFIG_USB_GADGET is not set +# CONFIG_USB_FUSB300 is not set +# CONFIG_USB_R8A66597 is not set +# CONFIG_USB_M66592 is not set +# CONFIG_USB_NET2272 is not set +# CONFIG_USB_DUMMY_HCD is not set +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +# CONFIG_USB_ETH is not set +# CONFIG_USB_G_NCM is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FUNCTIONFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_MASS_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_G_MULTI is not set +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set =20 # # OTG and related infrastructure @@ -2741,6 +2810,7 @@ CONFIG_LEDS_GPIO=3Dy # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_LT3593 is not set +# CONFIG_LEDS_RENESAS_TPU is not set CONFIG_LEDS_TRIGGERS=3Dy =20 # @@ -2758,8 +2828,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=3Dm # CONFIG_ACCESSIBILITY is not set CONFIG_RTC_LIB=3Dy CONFIG_RTC_CLASS=3Dy -CONFIG_RTC_HCTOSYS=3Dy -CONFIG_RTC_HCTOSYS_DEVICE=3D"rtc0" +# CONFIG_RTC_HCTOSYS is not set # CONFIG_RTC_DEBUG is not set =20 # @@ -2786,7 +2855,7 @@ CONFIG_RTC_DRV_X1205=3Dm CONFIG_RTC_DRV_PCF8563=3Dm CONFIG_RTC_DRV_PCF8583=3Dm CONFIG_RTC_DRV_M41T80=3Dm -# CONFIG_RTC_DRV_M41T80_WDT is not set +CONFIG_RTC_DRV_M41T80_WDT=3Dy CONFIG_RTC_DRV_BQ32K=3Dm CONFIG_RTC_DRV_S35390A=3Dm CONFIG_RTC_DRV_FM3130=3Dm @@ -2839,6 +2908,7 @@ CONFIG_DMADEVICES=3Dy CONFIG_AMBA_PL08X=3Dy CONFIG_DW_DMAC=3Dm CONFIG_TIMB_DMA=3Dm +CONFIG_PL330_DMA=3Dm CONFIG_DMA_ENGINE=3Dy =20 # @@ -2856,10 +2926,16 @@ CONFIG_UIO_PDRV_GENIRQ=3Dm # Virtio drivers # # CONFIG_VIRTIO_BALLOON is not set +# CONFIG_VIRTIO_MMIO is not set # CONFIG_STAGING is not set CONFIG_CLKDEV_LOOKUP=3Dy + +# +# Hardware Spinlock drivers +# # CONFIG_IOMMU_SUPPORT is not set # CONFIG_VIRT_DRIVERS is not set +# CONFIG_PM_DEVFREQ is not set =20 # # File systems @@ -3188,6 +3264,7 @@ CONFIG_HAVE_ARCH_KGDB=3Dy # Security options # CONFIG_KEYS=3Dy +# CONFIG_ENCRYPTED_KEYS is not set # CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set # CONFIG_SECURITY is not set @@ -3219,6 +3296,7 @@ CONFIG_CRYPTO_PCOMP=3Dm CONFIG_CRYPTO_PCOMP2=3Dy CONFIG_CRYPTO_MANAGER=3Dy CONFIG_CRYPTO_MANAGER2=3Dy +CONFIG_CRYPTO_USER=3Dm CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=3Dy CONFIG_CRYPTO_GF128MUL=3Dm # CONFIG_CRYPTO_NULL is not set @@ -3277,6 +3355,7 @@ CONFIG_CRYPTO_AES=3Dm CONFIG_CRYPTO_ANUBIS=3Dm CONFIG_CRYPTO_ARC4=3Dm CONFIG_CRYPTO_BLOWFISH=3Dm +CONFIG_CRYPTO_BLOWFISH_COMMON=3Dm CONFIG_CRYPTO_CAMELLIA=3Dm CONFIG_CRYPTO_CAST5=3Dm CONFIG_CRYPTO_CAST6=3Dm diff --git a/config/rootfiles/common/armv5tel/linux-omap b/config/rootfiles/c= ommon/armv5tel/linux-omap index d5e7cf0..43f7aa0 100644 --- a/config/rootfiles/common/armv5tel/linux-omap +++ b/config/rootfiles/common/armv5tel/linux-omap @@ -1,5 +1,5 @@ boot/uInit-ipfire-omap boot/uImage-ipfire-omap -boot/System.map-2.6.40.32-ipfire-omap -boot/config-2.6.40.32-ipfire-omap -lib/modules/2.6.40.32-ipfire-omap +boot/System.map-2.6.42.19-ipfire-omap +boot/config-2.6.42.19-ipfire-omap +lib/modules/2.6.42.19-ipfire-omap diff --git a/config/rootfiles/common/armv5tel/linux-rpi b/config/rootfiles/co= mmon/armv5tel/linux-rpi index 5a14b2f..7c18d4b 100644 --- a/config/rootfiles/common/armv5tel/linux-rpi +++ b/config/rootfiles/common/armv5tel/linux-rpi @@ -1,4 +1,4 @@ boot/kernel.img -boot/System.map-2.6.41.10-ipfire-rpi -boot/config-2.6.41.10-ipfire-rpi -lib/modules/2.6.41.10-ipfire-rpi +boot/System.map-2.6.42.19-ipfire-rpi +boot/config-2.6.42.19-ipfire-rpi +lib/modules/2.6.42.19-ipfire-rpi diff --git a/config/rootfiles/core/59/update.sh b/config/rootfiles/core/59/up= date.sh index 5a3cc2a..2f1d865 100644 --- a/config/rootfiles/core/59/update.sh +++ b/config/rootfiles/core/59/update.sh @@ -34,12 +34,16 @@ done =20 # #Stop services +/etc/init.d/ipsec stop +/etc/init.d/sshd stop =20 # #Extract files +extract_files =20 # #Start services +/etc/init.d/sshd start if [ `grep "ENABLED=3Don" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi diff --git a/config/rootfiles/core/60/exclude b/config/rootfiles/core/60/excl= ude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/core/60/exclude @@ -0,0 +1,12 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/60/filelists/files b/config/rootfiles/core= /60/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/core/60/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/60/filelists/strongswan b/config/rootfiles= /core/60/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/60/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/60/meta b/config/rootfiles/core/60/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/60/meta @@ -0,0 +1 @@ +DEPS=3D"" diff --git a/config/rootfiles/core/60/update.sh b/config/rootfiles/core/60/up= date.sh new file mode 100644 index 0000000..5aaa23e --- /dev/null +++ b/config/rootfiles/core/60/update.sh @@ -0,0 +1,83 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2012 IPFire-Team . = # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=3D60 +for (( i=3D1; i<=3D$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services +/etc/init.d/ipsec stop + +# +#Extract files +extract_files +# +#Start services +if [ `grep "ENABLED=3Don" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#arch=3D`uname -m` +#if [ ${arch::3} =3D=3D "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-i= pfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-i= pfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/core/61/exclude b/config/rootfiles/core/61/excl= ude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/core/61/exclude @@ -0,0 +1,12 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/61/filelists/GeoIP b/config/rootfiles/core= /61/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/61/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/61/filelists/Net-Telnet b/config/rootfiles= /core/61/filelists/Net-Telnet new file mode 120000 index 0000000..66ca926 --- /dev/null +++ b/config/rootfiles/core/61/filelists/Net-Telnet @@ -0,0 +1 @@ +../../../common/Net-Telnet \ No newline at end of file diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core= /61/filelists/files new file mode 100644 index 0000000..78765a6 --- /dev/null +++ b/config/rootfiles/core/61/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/collectd +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +var/ipfire/general-functions.pl +var/ipfire/langs diff --git a/config/rootfiles/core/61/meta b/config/rootfiles/core/61/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/61/meta @@ -0,0 +1 @@ +DEPS=3D"" diff --git a/config/rootfiles/core/61/update.sh b/config/rootfiles/core/61/up= date.sh new file mode 100644 index 0000000..c6a8580 --- /dev/null +++ b/config/rootfiles/core/61/update.sh @@ -0,0 +1,80 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2012 IPFire-Team . = # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=3D61 +for (( i=3D1; i<=3D$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#arch=3D`uname -m` +#if [ ${arch::3} =3D=3D "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-i= pfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-i= pfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/packages/mtr b/config/rootfiles/packages/mtr new file mode 100644 index 0000000..25356a7 --- /dev/null +++ b/config/rootfiles/packages/mtr @@ -0,0 +1,2 @@ +usr/sbin/mtr +#usr/share/man/man8/mtr.8 diff --git a/config/rootfiles/packages/tcpick b/config/rootfiles/packages/tcp= ick new file mode 100644 index 0000000..f447d21 --- /dev/null +++ b/config/rootfiles/packages/tcpick @@ -0,0 +1,3 @@ +usr/bin/tcpick +#usr/man/man8/tcpick.8 +#usr/man/man8/tcpick_italian.8 diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr index bdc4267..7174fae 100755 Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ diff --git a/config/u-boot/boot.script b/config/u-boot/boot.script index e30615f..6fccbf1 100755 --- a/config/u-boot/boot.script +++ b/config/u-boot/boot.script @@ -1,4 +1,4 @@ fatload mmc 0:1 0x80000000 uImage-ipfire-omap fatload mmc 0:1 0x81600000 uInit-ipfire-omap -setenv bootargs vram=3D32M console=3DttyO2,115200n8 rootwait smsc95xx.macadd= r=3D$usbethaddr root=3D/dev/mmcblk0p3 rw +setenv bootargs vram=3D32M console=3Dtty1 omapfb.mode=3Ddvi:800x600MR-16(a)6= 0 rootwait smsc95xx.macaddr=3D$usbethaddr root=3D/dev/mmcblk0p3 rw bootm 0x80000000 0x81600000 diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 0023523..07dc9e7 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -421,7 +421,7 @@ if ($confighash{$dkey}[3] eq 'net') { $display =3D "$tustate[1]"= ; } =20 print <OpenVPN n2n<= /b>
+ OpenVPN n2n=
$confighash{$dkey}[10] $display=20 =20 END diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 4bfb6aa..0c4502d 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -573,6 +573,10 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'= }) { &write_routepushfile; undef $vpnsettings{'ROUTES_PUSH'}; } + else { + undef $vpnsettings{'ROUTES_PUSH'}; + &write_routepushfile; + } if ((length($cgiparams{'MAX_CLIENTS'}) =3D=3D 0) || (($cgiparams{'MAX_CL= IENTS'}) < 1 ) || (($cgiparams{'MAX_CLIENTS'}) > 255 )) { $errormessage =3D $Lang::tr{'invalid input for max clients'}; goto ADV_ERROR; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a47c9f7..b576d3e 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1368,7 +1368,7 @@ 'ovpnstatus log' =3D> 'OVPN-Status-Log', 'ovpnsys log' =3D> 'OVPN-System-Log', 'ovpn routes push options' =3D> 'Route push Optionen', -'ovpn routes push' =3D> 'Routen', +'ovpn routes push' =3D> 'Routen (eine pro Zeile)', 'ovpn errmsg invalid ip or mask' =3D> 'Ung=C3=BCltige Netzwerk-Adresse oder = Subnetzmaske', 'ovpn errmsg green already pushed' =3D> 'Route f=C3=BCr gr=C3=BCnes Netzwerk= wird immer gesetzt', 'package failed to install' =3D> 'Programmpaket konnte nicht installiert wer= den.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 16df2b9..d1c3b6b 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1395,6 +1395,10 @@ 'ovpn_processprioVH' =3D> 'Very high', 'ovpnstatus log' =3D> 'OVPN-Status-Log', 'ovpnsys log' =3D> 'OVPN-System-Log', +'ovpn routes push options' =3D> 'Route push options', +'ovpn routes push' =3D> 'Routes (one per line):', +'ovpn errmsg invalid ip or mask' =3D> 'Invalid network-address or subnetmask= ', +'ovpn errmsg green already pushed' =3D> 'Route for green network is always s= et', 'package failed to install' =3D> 'Package failed to install.', 'pagerefresh' =3D> 'Page is beeing refreshed, please wait.', 'pakfire accept all' =3D> 'Do you want to install all packages?', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 365630a..387ab4a 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1352,6 +1352,10 @@ 'ovpn_processprioVH' =3D> 'Muy alto', 'ovpnstatus log' =3D> 'OVPN-Status-Log', 'ovpnsys log' =3D> 'OVPN-System-Log', +'ovpn routes push options' =3D> 'Route push options', +'ovpn routes push' =3D> 'Routes (one per line):', +'ovpn errmsg invalid ip or mask' =3D> 'Invalid network-address or subnetmask= ', +'ovpn errmsg green already pushed' =3D> 'Route for green network is always s= et', 'package failed to install' =3D> 'Fall=C3=B3 la instalaci=C3=B3n del paquete= ', 'pagerefresh' =3D> 'La p=C3=A1gina se est=C3=A1 actualiszando, por favor esp= ere.', 'pakfire accept all' =3D> '=C2=BFDesea instalar todos los paquetes?', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index e7e5aed..a537459 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1364,6 +1364,10 @@ 'ovpn_processprioVH' =3D> 'Tr=C3=A8s haute', 'ovpnstatus log' =3D> 'Journal statut OVPN', 'ovpnsys log' =3D> 'Journal syst=C3=A8me OVPN', +'ovpn routes push options' =3D> 'Options de Route push', +'ovpn routes push' =3D> 'Routes (une par ligne):', +'ovpn errmsg invalid ip or mask' =3D> 'Adresse ou masque de sous-r?seau inva= lide', +'ovpn errmsg green already pushed' =3D> 'La route pour le r?seau green est t= oujours activ?e', 'package failed to install' =3D> 'L\'installation du paquet a =C3=A9chou=C3= =A9.', 'pagerefresh' =3D> 'La page est entrain d\'=C3=AAtre rafraichie, veuillez at= tendre.', 'pakfire accept all' =3D> 'Voulez-vous installer tout les paquets?', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 12439e4..d8f1890 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1375,6 +1375,10 @@ 'ovpn_processprioVH' =3D> 'Bardzo wysoki', 'ovpnstatus log' =3D> 'OVPN-Status-Log', 'ovpnsys log' =3D> 'OVPN-System-Log', +'ovpn routes push options' =3D> 'Route push options', +'ovpn routes push' =3D> 'Routes (one per line):', +'ovpn errmsg invalid ip or mask' =3D> 'Invalid network-address or subnetmask= ', +'ovpn errmsg green already pushed' =3D> 'Route for green network is always s= et', 'package failed to install' =3D> 'B=C5=82=C4=85d instalacji pakietu.', 'pagerefresh' =3D> 'Strona jest od=C5=9Bwie=C5=BCana, prosz=C4=99 czeka=C4= =87.', 'pakfire accept all' =3D> 'Czy chcesz zainstalowa=C4=87 wszystkie pakiety?', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 18c1349..c1afd01 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -1366,6 +1366,10 @@ 'ovpn_processprioVH' =3D> 'Very high', 'ovpnstatus log' =3D> 'OVPN-Status-Log', 'ovpnsys log' =3D> 'OVPN-System-Log', +'ovpn routes push options' =3D> '=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9= =D0=BA=D0=B8 =D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=D0=B8=D0=B7=D0=B0=D1= =86=D0=B8=D0=B8', +'ovpn routes push' =3D> '=D0=9C=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=D0=B8=D0= =B7=D0=B0=D1=82=D0=BE=D1=80=D1=8B (=D0=BF=D0=BE =D0=BE=D0=B4=D0=BD=D0=BE=D0= =BC=D1=83 =D0=BD=D0=B0 =D1=81=D1=82=D1=80=D0=BE=D1=87=D0=BA=D1=83)', +'ovpn errmsg invalid ip or mask' =3D> '=D0=9D=D0=B5=D0=BF=D1=80=D0=B0=D0=B2= =D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9 =D0=B0=D0=B4=D1=80=D0=B5=D1=81 =D0=B8=D0= =BB=D0=B8 =D0=BC=D0=B0=D1=81=D0=BA=D0=B0 =D0=BF=D0=BE=D0=B4=D1=81=D1=82=D0=B8= ', +'ovpn errmsg green already pushed' =3D> '=D0=9C=D0=B0=D1=80=D1=88=D1=80=D1= =83=D1=82 =D0=B4=D0=BB=D1=8F =D0=B7=D0=B5=D0=BB=D1=91=D0=BD=D0=BE=D0=B9 =D1= =81=D0=B5=D1=82=D0=B8 =D0=B2=D1=81=D0=B5=D0=B3=D0=B4=D0=B0 =D0=B2=D0=BA=D0=BB= =D1=8E=D1=87=D1=91=D0=BD', 'package failed to install' =3D> 'Package failed to install.', 'pagerefresh' =3D> 'Page is beeing refreshed, please wait.', 'pakfire accept all' =3D> 'Do you want to install all packages?', diff --git a/lfs/flash-images b/lfs/flash-images index 4091322..075808b 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -44,20 +44,18 @@ md5 : ############################################################################= ### # Installation Details ############################################################################= ### -IMGinst :=3D /install/images/$(SNAME)-$(VERSION).2gb-ext2.$(MACHINE)-full-c= ore$(CORE).img -IMGinsts :=3D /install/images/$(SNAME)-$(VERSION).2gb-ext2-scon.$(MACHINE)-f= ull-core$(CORE).img +IMGinst :=3D /install/images/$(SNAME)-$(VERSION).1gb-ext4.$(MACHINE)-full-c= ore$(CORE).img +IMGinsts :=3D /install/images/$(SNAME)-$(VERSION).1gb-ext4-scon.$(MACHINE)-f= ull-core$(CORE).img MNThdd :=3D /install/harddisk IMGpart :=3D /install/images/part_area IMGboot :=3D /install/images/bootfs # don't change SIZEboot this without checking Image size SIZEboot :=3D 50 IMGroot :=3D /install/images/rootfs -SIZEroot :=3D 1400 -IMGvar :=3D /install/images/varfs -SIZEvar :=3D 400 +SIZEroot :=3D 600 =20 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - rm -rf $(MNThdd) $(IMGinst) $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) && m= kdir -p $(MNThdd) + rm -rf $(MNThdd) $(IMGinst) $(IMGpart) $(IMGboot) $(IMGroot) && mkdir -p $(= MNThdd) =20 # Create first 32 sectors of image dd bs=3D1k if=3D/dev/zero of=3D$(IMGpart) count=3D16 @@ -65,7 +63,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Create images for filesystems dd bs=3D1K if=3D/dev/zero of=3D$(IMGboot) count=3D51184 # 50MB-16K dd bs=3D1M if=3D/dev/zero of=3D$(IMGroot) count=3D$(SIZEroot) - dd bs=3D1M if=3D/dev/zero of=3D$(IMGvar) count=3D$(SIZEvar) =20 # Format them ifeq "$(MACHINE_TYPE)" "arm" @@ -73,8 +70,7 @@ ifeq "$(MACHINE_TYPE)" "arm" else mkfs.ext2 -F $(IMGboot) endif - mkfs.ext2 -F $(IMGroot) - mkfs.ext2 -F $(IMGvar) + mkfs.ext4 -O ^has_journal,extent -F $(IMGroot) =20 # Mount Images mount -o loop $(IMGroot) $(MNThdd) @@ -82,7 +78,6 @@ endif mkdir $(MNThdd)/var mkdir $(MNThdd)/var/log mount -o loop $(IMGboot) $(MNThdd)/boot - mount -o loop $(IMGvar) $(MNThdd)/var =20 # Install MLO and uboot first ifeq "$(MACHINE_TYPE)" "arm" @@ -111,8 +106,8 @@ ifeq "$(MACHINE_TYPE)" "arm" endif sed -i -e "s|DEVICE2|#DEVICE2|g" $(MNThdd)/etc/fstab sed -i -e "s|DEVICE3|UUID=3D$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" = $(MNThdd)/etc/fstab - sed -i -e "s|DEVICE4|UUID=3D$$(blkid -sUUID $(IMGvar) | cut -d'"' -f2)|g" $= (MNThdd)/etc/fstab - sed -i -e "s|FSTYPE|ext2|g" $(MNThdd)/etc/fstab + sed -i -e "s|DEVICE4|#DEVICE4|g" $(MNThdd)/etc/fstab + sed -i -e "s|FSTYPE|ext4|g" $(MNThdd)/etc/fstab =20 ifneq "$(MACHINE_TYPE)" "arm" sed -i -e "s|MOUNT|ro|g" $(MNThdd)/boot/grub/grub.conf @@ -127,14 +122,13 @@ endif # Setup symlink for partresize at first boot... ln -sf ../init.d/partresize $(MNThdd)/etc/rc.d/rcsysinit.d/S25partresize # Setup symlink for fsresize at second boot... - ln -sf ../init.d/fsresize $(MNThdd)/etc/rc.d/rcsysinit.d/S26fsresize + ln -sf ../init.d/fsresize $(MNThdd)/etc/rc.d/rcsysinit.d/S42fsresize =20 # Unmount umount $(MNThdd)/proc umount $(MNThdd)/dev umount $(MNThdd)/sys umount $(MNThdd)/boot - umount $(MNThdd)/var umount $(MNThdd) =20 # zerofree the ext2 images to get better compression @@ -144,21 +138,18 @@ ifneq "$(MACHINE_TYPE)" "arm" fsck.ext2 -f -y $(IMGboot) endif zerofree $(IMGroot) - -fsck.ext2 -f -y $(IMGroot) - fsck.ext2 -f -y $(IMGroot) - zerofree $(IMGvar) - -fsck.ext2 -f -y $(IMGvar) - fsck.ext2 -f -y $(IMGvar) + -fsck.ext4 -f -y $(IMGroot) + fsck.ext4 -f -y $(IMGroot) =20 # Cat to an image - cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinst) + cat $(IMGpart) $(IMGboot) $(IMGroot) > $(IMGinst) =20 # Write Partition table ifneq "$(MACHINE_TYPE)" "arm" - echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \ + echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,0,0\n" \ | sfdisk -D -uM -H 64 -S 32 $(IMGinst) else - echo -e ",$(SIZEboot),c,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \ + echo -e ",$(SIZEboot),c,*\n,0,0\n,$(SIZEroot),L\n,0,0\n" \ | sfdisk -D -uM -H 64 -S 32 $(IMGinst) endif =20 @@ -187,6 +178,8 @@ ifneq "$(MACHINE_TYPE)" "arm" sed -i -e "s| panic=3D10 | console=3DttyS0,115200n8 panic=3D10 |g" $(MNThdd= )/boot/grub/grub.conf else sed -i -e "s| console=3Dtty1 | console=3DttyAMA0,115200n8 |g" $(MNThdd)/boo= t/cmdline.txt + sed -i -e "s| console=3Dtty1 omapfb.mode=3Ddvi:800x600MR-16(a)60 | console= =3DttyO2,115200n8 |g" $(MNThdd)/boot/boot.script + cd $(MNThdd)/boot && ./convert_bootscript endif =20 sed -i -e "s|1:2345:respawn:|#1:2345:respawn:|g" $(MNThdd)/etc/inittab @@ -207,22 +200,19 @@ ifneq "$(MACHINE_TYPE)" "arm" fsck.ext2 -f -y $(IMGboot) endif zerofree $(IMGroot) - -fsck.ext2 -f -y $(IMGroot) - fsck.ext2 -f -y $(IMGroot) - zerofree $(IMGvar) - -fsck.ext2 -f -y $(IMGvar) - fsck.ext2 -f -y $(IMGvar) + -fsck.ext4 -f -y $(IMGroot) + fsck.ext4 -f -y $(IMGroot) =20 # Cat to an image - cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinsts) - rm -vf $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) + cat $(IMGpart) $(IMGboot) $(IMGroot) > $(IMGinsts) + rm -vf $(IMGpart) $(IMGboot) $(IMGroot) =20 # Write Partition table ifneq "$(MACHINE_TYPE)" "arm" - echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \ + echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,0,0\n" \ | sfdisk -D -uM -H 64 -S 32 $(IMGinsts) else - echo -e ",$(SIZEboot),c,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \ + echo -e ",$(SIZEboot),c,*\n,0,0\n,$(SIZEroot),L\n,0,0\n" \ | sfdisk -D -uM -H 64 -S 32 $(IMGinsts) endif =20 @@ -239,4 +229,4 @@ endif # Compress Image gzip -f9 $(IMGinsts) =20 - rm -rf $(MNThdd) $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) + rm -rf $(MNThdd) $(IMGpart) $(IMGboot) $(IMGroot) diff --git a/lfs/linux-rpi b/lfs/linux-rpi deleted file mode 100644 index c8f5fc8..0000000 --- a/lfs/linux-rpi +++ /dev/null @@ -1,264 +0,0 @@ -############################################################################= ### -# = # -# IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2011 IPFire Team = # -# = # -# This program is free software: you can redistribute it and/or modify = # -# it under the terms of the GNU General Public License as published by = # -# the Free Software Foundation, either version 3 of the License, or = # -# (at your option) any later version. = # -# = # -# This program is distributed in the hope that it will be useful, = # -# but WITHOUT ANY WARRANTY; without even the implied warranty of = # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # -# GNU General Public License for more details. = # -# = # -# You should have received a copy of the GNU General Public License = # -# along with this program. If not, see . = # -# = # -############################################################################= ### - -############################################################################= ### -# Definitions -############################################################################= ### - -include Config - -PATCHLEVEL =3D .10 -VER =3D 2.6.41.10 - -XVERS =3D 3.1.10 -XVERSION =3D 2 -XPATCHLEVEL =3D 6 -XSUBLEVEL =3D 41 -XEXTRAVERSION =3D .10 - -THISAPP =3D linux-$(VER) -DL_FILE =3D linux-$(XVERS).tar.bz2 -DL_FROM =3D $(URL_IPFIRE) -DIR_APP =3D $(DIR_SRC)/$(THISAPP) -CFLAGS =3D -CXXFLAGS =3D - -PAK_VER =3D 20 -DEPS =3D "" - -VERSUFIX=3Dipfire$(KCFG) - -ifeq "$(HEADERS)" "1" -ifeq "$(TOOLS)" "1" - TARGET =3D $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)-tools - HEADERS_PREFIX =3D /tools -else - TARGET =3D $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX) - HEADERS_PREFIX =3D /usr -endif -else - TARGET =3D $(DIR_INFO)/linux-$(VER)-$(VERSUFIX) -endif - -ifeq "$(MACHINE_TYPE)" "arm" - HEADERS_ARCH=3Darm -else - HEADERS_ARCH=3Dx86 -endif - -ifeq "$(KCFG)" "" -LASTKERNEL=3D1 -endif -ifeq "$(KCFG)" "-kirkwood" -LASTKERNEL=3D1 -endif - -############################################################################= ### -# Top-level Rules -############################################################################= ### -objects =3D$(DL_FILE) \ - patch-2.6.16-nath323-1.3.bz2 \ - rpi-patches-9efb470.patch.xz - - -$(DL_FILE) =3D $(URL_IPFIRE)/$(DL_FILE) -patch-2.6.16-nath323-1.3.bz2 =3D $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 -rpi-patches-9efb470.patch.xz =3D $(URL_IPFIRE)/rpi-patches-9efb470.patch.xz - -$(DL_FILE)_MD5 =3D 3649bdaa50ffd9114cc16486ec54d83a -patch-2.6.16-nath323-1.3.bz2_MD5 =3D f926409ff703a307baf54b57ab75d138 -rpi-patches-9efb470.patch.xz_MD5 =3D 833274ba420078d22f7f7b7f56debe1d - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) -############################################################################= ### -# Downloading, checking, md5sum -############################################################################= ### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################= ### -# Installation Details -############################################################################= ### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar axf $(DIR_DL)/$= (DL_FILE) - - # Change version from 3.x to 2.6.4x - cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^VERSION =3D.*$$/VERSION =3D $= (XVERSION)/g" Makefile - cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^PATCHLEVEL =3D.*$$/PATCHLEVEL= =3D $(XPATCHLEVEL)/g" Makefile - cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^SUBLEVEL =3D.*$$/SUBLEVEL =3D= $(XSUBLEVEL)/g" Makefile - cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^EXTRAVERSION =3D.*$$/EXTRAVER= SION =3D $(XEXTRAVERSION)/g" Makefile - mv $(DIR_SRC)/linux-$(XVERS) $(DIR_SRC)/linux-$(VER) - - ln -svf linux-$(VER) $(DIR_SRC)/linux - - # Linux Intermediate Queueing Device - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.1-imq.patch - - # Not report deprecated syscall 1.23 (for kudzu) -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_r= eport_sysctl_1.23.patch - - - # ipp2p 0.8.2-ipfire - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.0-ipp2p-0.8.2-= ipfire.patch - - # Layer7-patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/netfilter_layer7_2.22_= kernel3.0.patch - - # Add some more LED triggers -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netde= v-1.patch - - # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option= _add_huawei_android.patch - - # Fix uevent PHYSDEVDRIVER - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fi= x-driver-name.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs783= 0-fix-driver-name.patch - -ifeq "$(KCFG)" "-kirkwood" - # Add dreamplug,guruplug and icy 62x0 support on ARM-kirkwood - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45-arm_ki= rkwood_setups.patch -endif - -ifeq "$(MACHINE_TYPE)" "arm" - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45_align_= ssb_modtable_32bit_boundary.patch - - # Reverse some asm optimizations that are incompatible with older gcc - cd $(DIR_APP) && patch -p1 -R < $(DIR_SRC)/src/patches/linux-2.6-arm-asm-co= nstraint.patch -endif - -ifeq "$(KCFG)" "-omap" - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-wlan-fix.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-dvi720p.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-i2c-fix.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-reboot.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-rtc-twl-irq.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-memcpy.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.x-smsc95xx-add= _mac_addr_param.patch -endif - -ifeq "$(KCFG)" "-rpi" - # Apply Raspberry Pi kernel patches. (only avail for 3.1.x kernel yet) - -cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-9efb470.patch.xz | patch -Np1 -endif - -ifeq "$(HEADERS)" "1" - # Install the header files - cd $(DIR_APP) && make ARCH=3D$(HEADERS_ARCH) INSTALL_HDR_PATH=3Ddest header= s_install - -mkdir -pv $(BUILDROOT)/$(HEADERS_PREFIX)/include - cd $(DIR_APP) && find dest/include \( -name .install -o -name ..install.cmd= \) -delete - cd $(DIR_APP) && cp -rv dest/include/* $(BUILDROOT)/$(HEADERS_PREFIX)/inclu= de -else - - # Install ipfire logo - cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/kernel/ipfire_logo.ppm \ - drivers/video/logo/logo_linux_clut224.ppm - - # Cleanup kernel source - cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)= /.config - cd $(DIR_APP) && make CC=3D"$(KGCC)" oldconfig - cd $(DIR_APP) && make CC=3D"$(KGCC)" clean - cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =3D.*/EXTRAVERSION\ =3D\ $(PATC= HLEVEL)-$(VERSUFIX)/' Makefile - -ifeq "$(KCFG)" "-kirkwood" - cd $(DIR_APP) && make $(MAKETUNING) CC=3D"$(KGCC)" uImage - cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX) - cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX) -else -ifeq "$(KCFG)" "-omap" - cd $(DIR_APP) && make $(MAKETUNING) CC=3D"$(KGCC)" uImage - cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX) - cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX) -else -ifeq "$(KCFG)" "-rpi" - cd $(DIR_APP) && make $(MAKETUNING) CC=3D"$(KGCC)" zImage - cd /boot && cat first32k.bin $(DIR_APP)/arch/arm/boot/Image > kernel.img - cd $(DIR_APP) && cp -v /boot/kernel.img /boot/vmlinuz-$(VER)-$(VERSUFIX) -else -ifeq "$(KCFG)" "-versatile" - cd $(DIR_APP) && make $(MAKETUNING) CC=3D"$(KGCC)" zImage - cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX) -else - cd $(DIR_APP) && make $(MAKETUNING) CC=3D"$(KGCC)" bzImage - cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUF= IX) -endif -endif -endif -endif - cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX) - cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX) - ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX) - ln -sf System.map-$(VER)-$(VERSUFIX) /boot/System.map-$(VERSUFIX) - cd $(DIR_APP) && make CC=3D"$(KGCC)" $(MAKETUNING) modules - cd $(DIR_APP) && make CC=3D"$(KGCC)" $(MAKETUNING) modules_install - cd $(DIR_APP) && make CC=3D"$(KGCC)" $(MAKETUNING) firmware_install - -ifeq "$(LASTKERNEL)" "1" - # Only do this once - cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/ - - # Blacklist matroxfb_base - echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer - # Blacklist old framebuffer modules - for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name= *fb.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \ - done - # Blacklist new drm framebuffer modules - for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/= *.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \ - done - sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer - - # Blacklist isdn modules - for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name = *.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \ - done - sed -i -e "s|.ko||g" /etc/modprobe.d/isdn - - # Disable ipv6 at runtime - echo "options ipv6 disable_ipv6=3D1" > /etc/modprobe.d/ipv6 -endif - -ifneq "$(MACHINE_TYPE)" "arm" - # Disable geode_aes modul - mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \ - /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.k= o.off -endif -endif - - @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs*= $(DIR_SRC)/netfilter-layer7-* - @$(POSTBUILD) diff --git a/lfs/linux3 b/lfs/linux3 index b7d5e26..e049be0 100644 --- a/lfs/linux3 +++ b/lfs/linux3 @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2011 IPFire Team = # +# Copyright (C) 2007-2012 IPFire Team = # # = # # 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 = # @@ -24,14 +24,17 @@ =20 include Config =20 -PATCHLEVEL =3D .32 -VER =3D 2.6.40.32 +PATCHLEVEL =3D .19 =20 -XVERS =3D 3.0.32 +VER =3D 2.6.42.19 + +XVERS =3D 3.2.19 XVERSION =3D 2 XPATCHLEVEL =3D 6 -XSUBLEVEL =3D 40 -XEXTRAVERSION =3D .32 +XSUBLEVEL =3D 42 +XEXTRAVERSION =3D .19 + +RPI_PATCHES =3D linux-3.2-bootc-5b84c25 =20 THISAPP =3D linux-$(VER) DL_FILE =3D linux-$(XVERS).tar.bz2 @@ -74,13 +77,15 @@ endif # Top-level Rules ############################################################################= ### objects =3D$(DL_FILE) \ - patch-2.6.16-nath323-1.3.bz2 + rpi-patches-$(RPI_PATCHES).patch.xz + =20 $(DL_FILE) =3D $(URL_IPFIRE)/$(DL_FILE) -patch-2.6.16-nath323-1.3.bz2 =3D $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 +rpi-patches-$(RPI_PATCHES).patch.xz =3D $(URL_IPFIRE)/rpi-patches-$(RPI_PATC= HES).patch.xz + +$(DL_FILE)_MD5 =3D 64c732cb425eb8787b841d11309bb335 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 =3D 0b2fac563b093465f5c6b3d571e57399 =20 -$(DL_FILE)_MD5 =3D 67ae0ca4e87fb22cecfce94cb90eaee9 -patch-2.6.16-nath323-1.3.bz2_MD5 =3D f926409ff703a307baf54b57ab75d138 =20 install : $(TARGET) =20 @@ -123,11 +128,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -svf linux-$(VER) $(DIR_SRC)/linux =20 # Linux Intermediate Queueing Device - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.1-imq.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-imq.patch =20 # Not report deprecated syscall 1.23 (for kudzu) # cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_r= eport_sysctl_1.23.patch =20 + # ipp2p 0.8.2-ipfire cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.0-ipp2p-0.8.2-= ipfire.patch =20 @@ -141,7 +147,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option= _add_huawei_android.patch =20 # Fix uevent PHYSDEVDRIVER - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fi= x-driver-name.patch +# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-f= ix-driver-name.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs783= 0-fix-driver-name.patch =20 ifeq "$(KCFG)" "-kirkwood" @@ -157,15 +163,19 @@ ifeq "$(MACHINE_TYPE)" "arm" endif =20 ifeq "$(KCFG)" "-omap" - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-wlan-fix.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-dvi720p.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-i2c-fix.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-reboot.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-rtc-twl-irq.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboar= d-memcpy.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-0001-panda-w= lan-fix.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-0002-panda-i= 2c.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-panda-reboot= .patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.x-smsc95xx-add= _mac_addr_param.patch endif =20 +ifeq "$(KCFG)" "-rpi" + # Apply Raspberry Pi kernel patches. (only avail for 3.1.x kernel yet) + cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patc= h -Np1 + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-alsa= mixer.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-limi= t_volume.patch +endif + ifeq "$(HEADERS)" "1" # Install the header files cd $(DIR_APP) && make ARCH=3D$(HEADERS_ARCH) INSTALL_HDR_PATH=3Ddest header= s_install @@ -194,6 +204,11 @@ ifeq "$(KCFG)" "-omap" cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX) cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX) else +ifeq "$(KCFG)" "-rpi" + cd $(DIR_APP) && make $(MAKETUNING) CC=3D"$(KGCC)" zImage + cd /boot && cat first32k.bin $(DIR_APP)/arch/arm/boot/Image > kernel.img + cd $(DIR_APP) && cp -v /boot/kernel.img /boot/vmlinuz-$(VER)-$(VERSUFIX) +else ifeq "$(KCFG)" "-versatile" cd $(DIR_APP) && make $(MAKETUNING) CC=3D"$(KGCC)" zImage cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX) @@ -203,6 +218,7 @@ else endif endif endif +endif cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX) cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX) ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX) @@ -237,10 +253,6 @@ ifeq "$(LASTKERNEL)" "1" echo "options ipv6 disable_ipv6=3D1" > /etc/modprobe.d/ipv6 endif =20 - # Remove mISDN modules - rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN - rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN - ifneq "$(MACHINE_TYPE)" "arm" # Disable geode_aes modul mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \ diff --git a/lfs/mtr b/lfs/mtr new file mode 100644 index 0000000..ca08396 --- /dev/null +++ b/lfs/mtr @@ -0,0 +1,85 @@ +############################################################################= ### +# = # +# IPFire.org - A linux based firewall = # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt = # +# = # +# This program is free software: you can redistribute it and/or modify = # +# it under the terms of the GNU General Public License as published by = # +# the Free Software Foundation, either version 3 of the License, or = # +# (at your option) any later version. = # +# = # +# This program is distributed in the hope that it will be useful, = # +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # +# GNU General Public License for more details. = # +# = # +# You should have received a copy of the GNU General Public License = # +# along with this program. If not, see . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 0.82 + +THISAPP =3D mtr-$(VER) +DL_FILE =3D $(THISAPP).tar.gz +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) +PROG =3D mtr +PAK_VER =3D 1 + +DEPS =3D "" + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D 10601ea543fda3e51545c4bce195b64c + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist:=20 + @$(PAK) + +############################################################################= ### +# Downloading, checking, md5sum +############################################################################= ### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################= ### +# Installation Details +############################################################################= ### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=3D/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/lfs/strongswan b/lfs/strongswan index 44497d4..d0d533d 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 4.6.3 +VER =3D 4.6.4 =20 THISAPP =3D strongswan-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 34146e514ced1738b4f2d9e7169bbb52 +$(DL_FILE)_MD5 =3D 4c0999c42faa0860ae0afc4f8efd9d04 =20 install : $(TARGET) =20 diff --git a/lfs/tcpick b/lfs/tcpick new file mode 100644 index 0000000..52ba75b --- /dev/null +++ b/lfs/tcpick @@ -0,0 +1,84 @@ +############################################################################= ### +# = # +# IPFire.org - A linux based firewall = # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt = # +# = # +# This program is free software: you can redistribute it and/or modify = # +# it under the terms of the GNU General Public License as published by = # +# the Free Software Foundation, either version 3 of the License, or = # +# (at your option) any later version. = # +# = # +# This program is distributed in the hope that it will be useful, = # +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # +# GNU General Public License for more details. = # +# = # +# You should have received a copy of the GNU General Public License = # +# along with this program. If not, see . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 0.2.1 + +THISAPP =3D tcpick-$(VER) +DL_FILE =3D $(THISAPP).tar.gz +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) +PROG =3D tcpick +PAK_VER =3D 1 + +DEPS =3D "" + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D bb94f2f9ea81aeb645619fbe9b3b9a29 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist:=20 + @$(PAK) + +############################################################################= ### +# Downloading, checking, md5sum +############################################################################= ### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################= ### +# Installation Details +############################################################################= ### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=3D/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 7cd9f4d..2c52ad1 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME=3D"IPFire" # Software name SNAME=3D"ipfire" # Short name VERSION=3D"2.11" # Version number -CORE=3D"59" # Core Level (Filename) -PAKFIRE_CORE=3D"59" # Core Level (PAKFIRE) +CORE=3D"61" # Core Level (Filename) +PAKFIRE_CORE=3D"60" # Core Level (PAKFIRE) GIT_BRANCH=3D`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN=3D"www.ipfire.org" # Software slogan CONFIG_ROOT=3D/var/ipfire # Configuration rootdir @@ -438,7 +438,7 @@ buildipfire() { ipfiremake igb KCFG=3D"" else # arm-omap kernel build - ipfiremake linux-rpi KCFG=3D"-rpi" + ipfiremake linux3 KCFG=3D"-rpi" =20 ipfiremake linux3 KCFG=3D"-omap" =20 @@ -771,6 +771,8 @@ buildipfire() { ipfiremake transmission ipfiremake dpfhack ipfiremake lcd4linux + ipfiremake mtr + ipfiremake tcpick echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd index bdb5ca2..544b3e1 100644 --- a/src/initscripts/init.d/collectd +++ b/src/initscripts/init.d/collectd @@ -86,9 +86,14 @@ case "$1" in sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf fi =20 - boot_mesg "Starting Collection daemon..." - /usr/sbin/collectd -C /etc/collectd.conf - evaluate_retval + if [ $(date +%Y) -gt 2011 ]; then + boot_mesg "Starting Collection daemon..." + /usr/sbin/collectd -C /etc/collectd.conf + evaluate_retval + else + boot_mesg "collectd: cannot start with incorrect time ($(date))." + echo_warning; + fi ;; stop) boot_mesg "Stopping Collection daemon..." diff --git a/src/initscripts/init.d/fsresize b/src/initscripts/init.d/fsresize index 8913eb9..3dbd1ad 100644 --- a/src/initscripts/init.d/fsresize +++ b/src/initscripts/init.d/fsresize @@ -2,11 +2,11 @@ ######################################################################## # Begin $rc_base/init.d/fsresize # -# Description : Resize the /var filesystem +# Description : Resize the root filesystem in the background # # Authors : Arne Fitzenreiter - arne_f(a)ipfire.org # -# Version : 1.00 +# Version : 1.01 # # Notes : # @@ -17,27 +17,24 @@ =20 case "${1}" in start) - boot_mesg "Mounting root file system in read/write mode ..." - mount -o remount,rw / > /dev/null - evaluate_retval - - boot_mesg "Autoresize /var partition to use the whole drive ..." + boot_mesg "Background Autoresize root partition to use the whole drive" # Detect device ROOT=3D`mount | grep -m1 " / " | cut -d" " -f1`; DRV=3D${ROOT::`expr length $ROOT`-1} - boot_mesg " * check filesystem on ${DRV}4 before resize ..." - fsck -f -y ${DRV}4 =20 - boot_mesg " * resize ${DRV}4 ..." - resize2fs -p ${DRV}4 - evaluate_retval + boot_mesg "resize ${DRV}3 ..." + nice -n 19 $0 background ${DRV}3 > /dev/null & + ;; + background) + resize2fs -p $2 =20 # Erase symlink, it should run only once - rm -f /etc/rc.d/rcsysinit.d/S26fsresize + rm -f /etc/rc.d/rcsysinit.d/S42fsresize sync - exit 0; + ;; + *) echo "Usage: ${0} {start}" exit 1 diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/partr= esize index ae70ff9..c78c0c5 100644 --- a/src/initscripts/init.d/partresize +++ b/src/initscripts/init.d/partresize @@ -2,11 +2,11 @@ ######################################################################## # Begin $rc_base/init.d/partresize # -# Description : Resize the /var partition to the drivesize +# Description : Resize the root partition to the drivesize # # Authors : Arne Fitzenreiter - arne_f(a)ipfire.org # -# Version : 1.00 +# Version : 1.01 # # Notes : # @@ -30,8 +30,8 @@ case "${1}" in DRV=3D${ROOT::`expr length $ROOT`-1} fi =20 - boot_mesg "Change Partition 4 to all free space ..." - echo -e 'd\n4\nn\np\n4\n\n\nw\nq\n' | fdisk ${DRV} + boot_mesg "Change Partition $(DRV)3 to all free space ..." + echo -e 'd\n3\nn\np\n3\n\n\nw\nq\n' | fdisk ${DRV} =20 # Erase symlink, it should run only once rm -f /etc/rc.d/rcsysinit.d/S25partresize diff --git a/src/patches/linux-2.6.40-pandaboard-dvi720p.patch b/src/patches/= linux-2.6.40-pandaboard-dvi720p.patch deleted file mode 100755 index 8ec3586..0000000 --- a/src/patches/linux-2.6.40-pandaboard-dvi720p.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/bo= ard-omap4panda.c -index 90485fc..7a92185 100644 ---- a/arch/arm/mach-omap2/board-omap4panda.c -+++ b/arch/arm/mach-omap2/board-omap4panda.c -@@ -583,7 +583,7 @@ static void omap4_panda_disable_dvi(struct omap_dss_devi= ce *dssdev) -=20 - /* Using generic display panel */ - static struct panel_generic_dpi_data omap4_dvi_panel =3D { -- .name =3D "generic", -+ .name =3D "dvi_720p", - .platform_enable =3D omap4_panda_enable_dvi, - .platform_disable =3D omap4_panda_disable_dvi, - }; -diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/vide= o/omap2/displays/panel-generic-dpi.c -index 9c90f75..af8352f 100644 ---- a/drivers/video/omap2/displays/panel-generic-dpi.c -+++ b/drivers/video/omap2/displays/panel-generic-dpi.c -@@ -232,7 +232,32 @@ static struct panel_config generic_dpi_panels[] =3D { - .power_off_delay =3D 0, - .name =3D "powertip_ph480272t", - }, --}; -+ -+ /* Vesa 720p 1280x768 */ -+ { -+ { -+ .x_res =3D 1280, -+ .y_res =3D 768, -+ -+ .pixel_clock =3D 71000, -+ -+ .hfp =3D 128, -+ .hsw =3D 64, -+ .hbp =3D 192, -+ -+ .vfp =3D 3, -+ .vsw =3D 7, -+ .vbp =3D 20, -+ }, -+ .acbi =3D 0x0, -+ .acb =3D 0x0, -+ .config =3D OMAP_DSS_LCD_TFT, -+ .power_on_delay =3D 0, -+ .power_off_delay =3D 0, -+ .name =3D "dvi_720p", -+ }, -+ }; -+ -=20 - struct panel_drv_data { -=20 diff --git a/src/patches/linux-2.6.40-pandaboard-i2c-fix.patch b/src/patches/= linux-2.6.40-pandaboard-i2c-fix.patch deleted file mode 100755 index ea847be..0000000 --- a/src/patches/linux-2.6.40-pandaboard-i2c-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c -index 58a58c7..bba0441 100644 ---- a/drivers/i2c/busses/i2c-omap.c -+++ b/drivers/i2c/busses/i2c-omap.c -@@ -276,7 +276,7 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev) -=20 - pm_runtime_get_sync(&pdev->dev); -=20 -- if (cpu_is_omap34xx()) { -+ if (cpu_is_omap34xx() || cpu_is_omap44xx()) { - omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0); - omap_i2c_write_reg(dev, OMAP_I2C_PSC_REG, dev->pscstate); - omap_i2c_write_reg(dev, OMAP_I2C_SCLL_REG, dev->scllstate); -@@ -493,7 +493,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev) - OMAP_I2C_IE_AL) | ((dev->fifo_size) ? - (OMAP_I2C_IE_RDR | OMAP_I2C_IE_XDR) : 0); - omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate); -- if (cpu_is_omap34xx()) { -+ if (cpu_is_omap34xx() || cpu_is_omap44xx()) { - dev->pscstate =3D psc; - dev->scllstate =3D scll; - dev->sclhstate =3D sclh; diff --git a/src/patches/linux-2.6.40-pandaboard-memcpy.patch b/src/patches/l= inux-2.6.40-pandaboard-memcpy.patch deleted file mode 100644 index 69e5e6e..0000000 --- a/src/patches/linux-2.6.40-pandaboard-memcpy.patch +++ /dev/null @@ -1,21 +0,0 @@ -arch/arm/lib/uaccess_with_memcpy.c: In function 'pin_page_for_write': -arch/arm/lib/uaccess_with_memcpy.c:45: error: implicit declaration of functi= on 'kmap_atomic' -arch/arm/lib/uaccess_with_memcpy.c:48: error: implicit declaration of functi= on 'kunmap_atomic' -make[2]: *** [arch/arm/lib/uaccess_with_memcpy.o] Error 1 - -Signed-off-by: Paul Gortmaker - -diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_= memcpy.c -index 8b9b136..66945a6 100644 ---- a/arch/arm/lib/uaccess_with_memcpy.c -+++ b/arch/arm/lib/uaccess_with_memcpy.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---=20 -1.7.6 diff --git a/src/patches/linux-2.6.40-pandaboard-reboot.patch b/src/patches/l= inux-2.6.40-pandaboard-reboot.patch deleted file mode 100644 index 8e37837..0000000 --- a/src/patches/linux-2.6.40-pandaboard-reboot.patch +++ /dev/null @@ -1,29 +0,0 @@ -With commit 3d3f78d752bf, reboot seems to broken on ARM -machines. CPU dies while doing flush_pmd_entry() as part of -setup_mm_for_reboot() - -I know this is not the fix but intention is to report the -issue and also provide temporary fix till it get fixed correctly - -Signed-off-by: Santosh Shilimkar -Reported-by: Anand Gadiyar ---- -Tested with OMAP4 device. - - arch/arm/kernel/process.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c -index e76fcaa..ac370b2 100644 ---- a/arch/arm/kernel/process.c -+++ b/arch/arm/kernel/process.c -@@ -247,7 +247,6 @@ void machine_power_off(void) -=20 - void machine_restart(char *cmd) - { -- machine_shutdown(); - arm_pm_restart(reboot_mode, cmd); - } -=20 ---=20 -1.6.0.4 diff --git a/src/patches/linux-2.6.40-pandaboard-rtc-twl-irq.patch b/src/patc= hes/linux-2.6.40-pandaboard-rtc-twl-irq.patch deleted file mode 100644 index dc1182d..0000000 --- a/src/patches/linux-2.6.40-pandaboard-rtc-twl-irq.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur linux-3.0.24.org/drivers/rtc/rtc-twl.c linux-3.0.24/drivers/rtc/r= tc-twl.c ---- linux-3.0.24.org/drivers/rtc/rtc-twl.c 2012-03-12 18:58:19.000000000 +01= 00 -+++ linux-3.0.24/drivers/rtc/rtc-twl.c 2012-03-20 23:24:52.213578926 +0100 -@@ -362,14 +362,6 @@ - int res; - u8 rd_reg; -=20 --#ifdef CONFIG_LOCKDEP -- /* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which -- * we don't want and can't tolerate. Although it might be -- * friendlier not to borrow this thread context... -- */ -- local_irq_enable(); --#endif -- - res =3D twl_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG); - if (res) - goto out; -@@ -462,7 +454,7 @@ - if (ret < 0) - goto out1; -=20 -- ret =3D request_irq(irq, twl_rtc_interrupt, -+ ret =3D request_threaded_irq(irq, NULL, twl_rtc_interrupt, - IRQF_TRIGGER_RISING, - dev_name(&rtc->dev), rtc); - if (ret < 0) { diff --git a/src/patches/linux-2.6.40-pandaboard-wlan-fix.patch b/src/patches= /linux-2.6.40-pandaboard-wlan-fix.patch deleted file mode 100755 index 1b6b5c4..0000000 --- a/src/patches/linux-2.6.40-pandaboard-wlan-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/bo= ard-omap4panda.c -index 1269658..8ec6330 100644 ---- a/arch/arm/mach-omap2/board-omap4panda.c -+++ b/arch/arm/mach-omap2/board-omap4panda.c -@@ -377,6 +377,7 @@ static struct regulator_init_data omap4_panda_vusb =3D { - static struct regulator_init_data omap4_panda_clk32kg =3D { - .constraints =3D { - .valid_ops_mask =3D REGULATOR_CHANGE_STATUS, -+ .always_on =3D true, - }, - }; -=20 diff --git a/src/patches/linux-2.x-smsc95xx-add_mac_addr_param.patch b/src/pa= tches/linux-2.x-smsc95xx-add_mac_addr_param.patch old mode 100755 new mode 100644 diff --git a/src/patches/linux-3.2-0001-panda-wlan-fix.patch b/src/patches/li= nux-3.2-0001-panda-wlan-fix.patch new file mode 100644 index 0000000..a2aaf20 --- /dev/null +++ b/src/patches/linux-3.2-0001-panda-wlan-fix.patch @@ -0,0 +1,12 @@ +diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-comm= on.c +index daa056e..fe03b09 100644 +--- a/arch/arm/mach-omap2/twl-common.c ++++ b/arch/arm/mach-omap2/twl-common.c +@@ -261,6 +261,7 @@ static struct regulator_init_data omap4_vusb_idata =3D { + static struct regulator_init_data omap4_clk32kg_idata =3D { + .constraints =3D { + .valid_ops_mask =3D REGULATOR_CHANGE_STATUS, ++ .always_on =3D true, + }, + }; +=20 diff --git a/src/patches/linux-3.2-0002-panda-i2c.patch b/src/patches/linux-3= .2-0002-panda-i2c.patch new file mode 100644 index 0000000..fa3f6cc --- /dev/null +++ b/src/patches/linux-3.2-0002-panda-i2c.patch @@ -0,0 +1,51 @@ +diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c +index 7f47092..2a05d3d 100644 +--- a/arch/arm/mach-omap2/id.c ++++ b/arch/arm/mach-omap2/id.c +@@ -389,8 +389,10 @@ static void __init omap4_check_revision(void) + omap_revision =3D OMAP4430_REV_ES2_1; + break; + case 4: +- default: + omap_revision =3D OMAP4430_REV_ES2_2; ++ case 6: ++ default: ++ omap_revision =3D OMAP4430_REV_ES2_3; + } + break; + case 0xb94e: +@@ -403,7 +405,7 @@ static void __init omap4_check_revision(void) + break; + default: + /* Unknown default to latest silicon rev as default */ +- omap_revision =3D OMAP4430_REV_ES2_2; ++ omap_revision =3D OMAP4430_REV_ES2_3; + } +=20 + pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16, +diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap= 2/omap_hwmod_44xx_data.c +index 7695e5d..71d3e36 100644 +--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c ++++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +@@ -2257,7 +2257,8 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_clas= s =3D { + }; +=20 + static struct omap_i2c_dev_attr i2c_dev_attr =3D { +- .flags =3D OMAP_I2C_FLAG_BUS_SHIFT_NONE, ++ .flags =3D OMAP_I2C_FLAG_BUS_SHIFT_NONE | ++ OMAP_I2C_FLAG_RESET_REGS_POSTIDLE, + }; +=20 + /* i2c1 */ +diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/incl= ude/plat/cpu.h +index 408a12f..e279395 100644 +--- a/arch/arm/plat-omap/include/plat/cpu.h ++++ b/arch/arm/plat-omap/include/plat/cpu.h +@@ -391,6 +391,7 @@ IS_OMAP_TYPE(3517, 0x3517) + #define OMAP4430_REV_ES2_0 (OMAP443X_CLASS | (0x20 << 8)) + #define OMAP4430_REV_ES2_1 (OMAP443X_CLASS | (0x21 << 8)) + #define OMAP4430_REV_ES2_2 (OMAP443X_CLASS | (0x22 << 8)) ++#define OMAP4430_REV_ES2_3 (OMAP443X_CLASS | (0x23 << 8)) +=20 + #define OMAP446X_CLASS 0x44600044 + #define OMAP4460_REV_ES1_0 (OMAP446X_CLASS | (0x10 << 8)) diff --git a/src/patches/linux-3.2-bcm2835-alsamixer.patch b/src/patches/linu= x-3.2-bcm2835-alsamixer.patch new file mode 100644 index 0000000..bfe3d02 --- /dev/null +++ b/src/patches/linux-3.2-bcm2835-alsamixer.patch @@ -0,0 +1,48 @@ +diff -Naur linux-3.2.19.org/sound/arm/bcm2835-ctl.c linux-3.2.19/sound/arm/b= cm2835-ctl.c +--- linux-3.2.19.org/sound/arm/bcm2835-ctl.c 2012-06-04 21:11:15.000000000 += 0200 ++++ linux-3.2.19/sound/arm/bcm2835-ctl.c 2012-06-04 21:32:37.969298501 +0200 +@@ -33,6 +33,19 @@ +=20 + #include "bcm2835.h" +=20 ++ ++/* functions to convert alsa to chip volume and back. */ ++int alsa2chip(int vol) ++{ ++ return -((vol << 8) / 100); ++} ++ ++int chip2alsa(int vol) ++{ ++ return -((vol * 100) >> 8); ++} ++ ++ + static int snd_bcm2835_ctl_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) + { +@@ -64,7 +77,7 @@ + BUG_ON(!chip && !(chip->avail_substreams & AVAIL_SUBSTREAMS_MASK)); +=20 + if (kcontrol->private_value =3D=3D PCM_PLAYBACK_VOLUME) +- ucontrol->value.integer.value[0] =3D chip->volume; ++ ucontrol->value.integer.value[0] =3D chip2alsa(chip->volume); + else if (kcontrol->private_value =3D=3D PCM_PLAYBACK_MUTE) + ucontrol->value.integer.value[0] =3D chip->mute; + else if (kcontrol->private_value =3D=3D PCM_PLAYBACK_DEVICE) +@@ -85,13 +98,10 @@ + changed =3D 1; + } + if (changed +- || (ucontrol->value.integer.value[0] !=3D chip->volume)) { +- int atten; ++ || (ucontrol->value.integer.value[0] !=3D chip2alsa(chip->volume))) { +=20 +- chip->volume =3D ucontrol->value.integer.value[0]; ++ chip->volume =3D alsa2chip(ucontrol->value.integer.value[0]); + changed =3D 1; +- atten =3D -((chip->volume << 8) / 100); +- chip->volume =3D atten; + } +=20 + } else if (kcontrol->private_value =3D=3D PCM_PLAYBACK_MUTE) { diff --git a/src/patches/linux-3.2-bcm2835-limit_volume.patch b/src/patches/l= inux-3.2-bcm2835-limit_volume.patch new file mode 100644 index 0000000..930033b --- /dev/null +++ b/src/patches/linux-3.2-bcm2835-limit_volume.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.2.19.org/sound/arm/bcm2835-ctl.c linux-3.2.19/sound/arm/b= cm2835-ctl.c +--- linux-3.2.19.org/sound/arm/bcm2835-ctl.c 2012-06-04 22:38:54.000000000 += 0200 ++++ linux-3.2.19/sound/arm/bcm2835-ctl.c 2012-06-05 22:37:46.343725845 +0200 +@@ -53,7 +53,7 @@ + uinfo->type =3D SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count =3D 1; + uinfo->value.integer.min =3D -10240; +- uinfo->value.integer.max =3D 2303; ++ uinfo->value.integer.max =3D 400; /* 2303 */ + } else if (kcontrol->private_value =3D=3D PCM_PLAYBACK_MUTE) { + uinfo->type =3D SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count =3D 1; diff --git a/src/patches/linux-3.2-imq.patch b/src/patches/linux-3.2-imq.patch new file mode 100644 index 0000000..8e8685d --- /dev/null +++ b/src/patches/linux-3.2-imq.patch @@ -0,0 +1,1603 @@ +diff -uNr linux-3.2/drivers/net/imq.c linux-3.2-imq/drivers/net/imq.c +--- linux-3.2/drivers/net/imq.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.2-imq/drivers/net/imq.c 2011-11-04 12:16:10.454992642 +0200 +@@ -0,0 +1,850 @@ ++/* ++ * 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 <=3D2.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_hea= der. ++ * These functions are correctly patched by this new patch vers= ion. ++ * ++ * 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 t= ime. ++ * ++ * ++ * 2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() inste= ad ++ * 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.26 - (JK) ++ * - Replaced tasklet with 'netif_schedule()'. ++ * - Cleaned up and added comments for imq_nf_queue(). ++ * ++ * 2009/04/12 ++ * - Add skb_save_cb/skb_restore_cb helper functions for backu= ping ++ * control buffer. This is needed because qdisc-layer on ker= nels ++ * 2.6.27 and newer overwrite control buffer. (Jussi Kivilin= na) ++ * - Add better locking for IMQ device. Hopefully this will so= lve ++ * SMP issues. (Jussi Kivilinna) ++ * - Port to 2.6.27 ++ * - Port to 2.6.28 ++ * - Port to 2.6.29 + fix rmmod not working ++ * ++ * 2009/04/20 - (Jussi Kivilinna) ++ * - Use netdevice feature flags to avoid extra packet handling ++ * by core networking layer and possibly increase performanc= e. ++ * ++ * 2009/09/26 - (Jussi Kivilinna) ++ * - Add imq_nf_reinject_lockless to fix deadlock with ++ * imq_nf_queue/imq_nf_reinject. ++ * ++ * 2009/12/08 - (Jussi Kivilinna) ++ * - Port to 2.6.32 ++ * - Add check for skb->nf_queue_entry=3D=3DNULL in imq_dev_xm= it() ++ * - Also add better error checking for skb->nf_queue_entry us= age ++ * ++ * 2010/02/25 - (Jussi Kivilinna) ++ * - Port to 2.6.33 ++ * ++ * 2010/08/15 - (Jussi Kivilinna) ++ * - Port to 2.6.35 ++ * - Simplify hook registration by using nf_register_hooks. ++ * - nf_reinject doesn't need spinlock around it, therefore re= move ++ * imq_nf_reinject function. Other nf_reinject users protect ++ * their own data with spinlock. With IMQ however all data is ++ * needed is stored per skbuff, so no locking is needed. ++ * - Changed IMQ to use 'separate' NF_IMQ_QUEUE instead of ++ * NF_QUEUE, this allows working coexistance of IMQ and other ++ * NF_QUEUE users. ++ * - Make IMQ multi-queue. Number of IMQ device queues can be ++ * increased with 'numqueues' module parameters. Default num= ber ++ * of queues is 1, in other words by default IMQ works as ++ * single-queue device. Multi-queue selection is based on ++ * IFB multi-queue patch by Changli Gao . ++ * ++ * 2011/03/18 - (Jussi Kivilinna) ++ * - Port to 2.6.38 ++ * ++ * 2011/07/12 - (syoder89(a)gmail.com) ++ * - Crash fix that happens when the receiving interface has m= ore ++ * than one queue (add missing skb_set_queue_mapping in ++ * imq_select_queue). ++ * ++ * 2011/07/26 - (Jussi Kivilinna) ++ * - Add queue mapping checks for packets exiting IMQ. ++ * - Port to 3.0 ++ * ++ * 2011/08/16 - (Jussi Kivilinna) ++ * - Clear IFF_TX_SKB_SHARING flag that was added for linux 3.= 0.2 ++ * ++ * 2011/11/03 - Germano Michel ++ * - Fix IMQ for net namespaces ++ * ++ * 2011/11/04 - Jussi Kivilinna ++ * - Port to 3.1 ++ * - Clean-up, move 'get imq device pointer by imqX name' to ++ * separate function from 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 ++#include ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ #include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num); ++ ++static nf_hookfn imq_nf_hook; ++ ++static struct nf_hook_ops imq_ops[] =3D { ++ { ++ /* imq_ingress_ipv4 */ ++ .hook =3D imq_nf_hook, ++ .owner =3D THIS_MODULE, ++ .pf =3D PF_INET, ++ .hooknum =3D NF_INET_PRE_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ .priority =3D NF_IP_PRI_MANGLE + 1, ++#else ++ .priority =3D NF_IP_PRI_NAT_DST + 1, ++#endif ++ }, ++ { ++ /* imq_egress_ipv4 */ ++ .hook =3D imq_nf_hook, ++ .owner =3D THIS_MODULE, ++ .pf =3D PF_INET, ++ .hooknum =3D NF_INET_POST_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) ++ .priority =3D NF_IP_PRI_LAST, ++#else ++ .priority =3D NF_IP_PRI_NAT_SRC - 1, ++#endif ++ }, ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ { ++ /* imq_ingress_ipv6 */ ++ .hook =3D imq_nf_hook, ++ .owner =3D THIS_MODULE, ++ .pf =3D PF_INET6, ++ .hooknum =3D NF_INET_PRE_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ .priority =3D NF_IP6_PRI_MANGLE + 1, ++#else ++ .priority =3D NF_IP6_PRI_NAT_DST + 1, ++#endif ++ }, ++ { ++ /* imq_egress_ipv6 */ ++ .hook =3D imq_nf_hook, ++ .owner =3D THIS_MODULE, ++ .pf =3D PF_INET6, ++ .hooknum =3D NF_INET_POST_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) ++ .priority =3D NF_IP6_PRI_LAST, ++#else ++ .priority =3D NF_IP6_PRI_NAT_SRC - 1, ++#endif ++ }, ++#endif ++}; ++ ++#if defined(CONFIG_IMQ_NUM_DEVS) ++static int numdevs =3D CONFIG_IMQ_NUM_DEVS; ++#else ++static int numdevs =3D IMQ_MAX_DEVS; ++#endif ++ ++static struct net_device *imq_devs_cache[IMQ_MAX_DEVS]; ++ ++#define IMQ_MAX_QUEUES 32 ++static int numqueues =3D 1; ++static u32 imq_hashrnd; ++ ++static inline __be16 pppoe_proto(const struct sk_buff *skb) ++{ ++ return *((__be16 *)(skb_mac_header(skb) + ETH_HLEN + ++ sizeof(struct pppoe_hdr))); ++} ++ ++static u16 imq_hash(struct net_device *dev, struct sk_buff *skb) ++{ ++ unsigned int pull_len; ++ u16 protocol =3D skb->protocol; ++ u32 addr1, addr2; ++ u32 hash, ihl =3D 0; ++ union { ++ u16 in16[2]; ++ u32 in32; ++ } ports; ++ u8 ip_proto; ++ ++ pull_len =3D 0; ++ ++recheck: ++ switch (protocol) { ++ case htons(ETH_P_8021Q): { ++ if (unlikely(skb_pull(skb, VLAN_HLEN) =3D=3D NULL)) ++ goto other; ++ ++ pull_len +=3D VLAN_HLEN; ++ skb->network_header +=3D VLAN_HLEN; ++ ++ protocol =3D vlan_eth_hdr(skb)->h_vlan_encapsulated_proto; ++ goto recheck; ++ } ++ ++ case htons(ETH_P_PPP_SES): { ++ if (unlikely(skb_pull(skb, PPPOE_SES_HLEN) =3D=3D NULL)) ++ goto other; ++ ++ pull_len +=3D PPPOE_SES_HLEN; ++ skb->network_header +=3D PPPOE_SES_HLEN; ++ ++ protocol =3D pppoe_proto(skb); ++ goto recheck; ++ } ++ ++ case htons(ETH_P_IP): { ++ const struct iphdr *iph =3D ip_hdr(skb); ++ ++ if (unlikely(!pskb_may_pull(skb, sizeof(struct iphdr)))) ++ goto other; ++ ++ addr1 =3D iph->daddr; ++ addr2 =3D iph->saddr; ++ ++ ip_proto =3D !(ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) ? ++ iph->protocol : 0; ++ ihl =3D ip_hdrlen(skb); ++ ++ break; ++ } ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ case htons(ETH_P_IPV6): { ++ const struct ipv6hdr *iph =3D ipv6_hdr(skb); ++ ++ if (unlikely(!pskb_may_pull(skb, sizeof(struct ipv6hdr)))) ++ goto other; ++ ++ addr1 =3D iph->daddr.s6_addr32[3]; ++ addr2 =3D iph->saddr.s6_addr32[3]; ++ ihl =3D ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &ip_proto); ++ if (unlikely(ihl < 0)) ++ goto other; ++ ++ break; ++ } ++#endif ++ default: ++other: ++ if (pull_len !=3D 0) { ++ skb_push(skb, pull_len); ++ skb->network_header -=3D pull_len; ++ } ++ ++ return (u16)(ntohs(protocol) % dev->real_num_tx_queues); ++ } ++ ++ if (addr1 > addr2) ++ swap(addr1, addr2); ++ ++ switch (ip_proto) { ++ case IPPROTO_TCP: ++ case IPPROTO_UDP: ++ case IPPROTO_DCCP: ++ case IPPROTO_ESP: ++ case IPPROTO_AH: ++ case IPPROTO_SCTP: ++ case IPPROTO_UDPLITE: { ++ if (likely(skb_copy_bits(skb, ihl, &ports.in32, 4) >=3D 0)) { ++ if (ports.in16[0] > ports.in16[1]) ++ swap(ports.in16[0], ports.in16[1]); ++ break; ++ } ++ /* fall-through */ ++ } ++ default: ++ ports.in32 =3D 0; ++ break; ++ } ++ ++ if (pull_len !=3D 0) { ++ skb_push(skb, pull_len); ++ skb->network_header -=3D pull_len; ++ } ++ ++ hash =3D jhash_3words(addr1, addr2, ports.in32, imq_hashrnd ^ ip_proto); ++ ++ return (u16)(((u64)hash * dev->real_num_tx_queues) >> 32); ++} ++ ++static inline bool sk_tx_queue_recorded(struct sock *sk) ++{ ++ return (sk_tx_queue_get(sk) >=3D 0); ++} ++ ++static struct netdev_queue *imq_select_queue(struct net_device *dev, ++ struct sk_buff *skb) ++{ ++ u16 queue_index =3D 0; ++ u32 hash; ++ ++ if (likely(dev->real_num_tx_queues =3D=3D 1)) ++ goto out; ++ ++ /* IMQ can be receiving ingress or engress packets. */ ++ ++ /* Check first for if rx_queue is set */ ++ if (skb_rx_queue_recorded(skb)) { ++ queue_index =3D skb_get_rx_queue(skb); ++ goto out; ++ } ++ ++ /* Check if socket has tx_queue set */ ++ if (sk_tx_queue_recorded(skb->sk)) { ++ queue_index =3D sk_tx_queue_get(skb->sk); ++ goto out; ++ } ++ ++ /* Try use socket hash */ ++ if (skb->sk && skb->sk->sk_hash) { ++ hash =3D skb->sk->sk_hash; ++ queue_index =3D ++ (u16)(((u64)hash * dev->real_num_tx_queues) >> 32); ++ goto out; ++ } ++ ++ /* Generate hash from packet data */ ++ queue_index =3D imq_hash(dev, skb); ++ ++out: ++ if (unlikely(queue_index >=3D dev->real_num_tx_queues)) ++ queue_index =3D (u16)((u32)queue_index % dev->real_num_tx_queues); ++ ++ skb_set_queue_mapping(skb, queue_index); ++ return netdev_get_tx_queue(dev, queue_index); ++} ++ ++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 =3D skb->nf_queue_entry; ++ ++ skb->nf_queue_entry =3D NULL; ++ ++ if (entry) { ++ nf_queue_entry_release_refs(entry); ++ kfree(entry); ++ } ++ ++ skb_restore_cb(skb); /* kfree backup */ ++} ++ ++static void imq_done_check_queue_mapping(struct sk_buff *skb, ++ struct net_device *dev) ++{ ++ unsigned int queue_index; ++ ++ /* Don't let queue_mapping be left too large after exiting IMQ */ ++ if (likely(skb->dev !=3D dev && skb->dev !=3D NULL)) { ++ queue_index =3D skb_get_queue_mapping(skb); ++ if (unlikely(queue_index >=3D skb->dev->real_num_tx_queues)) { ++ queue_index =3D (u16)((u32)queue_index % ++ skb->dev->real_num_tx_queues); ++ skb_set_queue_mapping(skb, queue_index); ++ } ++ } else { ++ /* skb->dev was IMQ device itself or NULL, be on safe side and ++ * just clear queue mapping. ++ */ ++ skb_set_queue_mapping(skb, 0); ++ } ++} ++ ++static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct nf_queue_entry *entry =3D skb->nf_queue_entry; ++ ++ skb->nf_queue_entry =3D NULL; ++ dev->trans_start =3D jiffies; ++ ++ dev->stats.tx_bytes +=3D skb->len; ++ dev->stats.tx_packets++; ++ ++ if (unlikely(entry =3D=3D NULL)) { ++ /* We don't know what is going on here.. packet is queued for ++ * imq device, but (probably) not by us. ++ * ++ * If this packet was not send here by imq_nf_queue(), then ++ * skb_save_cb() was not used and skb_free() should not show: ++ * WARNING: IMQ: kfree_skb: skb->cb_next:.. ++ * and/or ++ * WARNING: IMQ: kfree_skb: skb->nf_queue_entry... ++ * ++ * However if this message is shown, then IMQ is somehow broken ++ * and you should report this to linuximq.net. ++ */ ++ ++ /* imq_dev_xmit is black hole that eats all packets, report that ++ * we eat this packet happily and increase dropped counters. ++ */ ++ ++ dev->stats.tx_dropped++; ++ dev_kfree_skb(skb); ++ ++ return NETDEV_TX_OK; ++ } ++ ++ skb_restore_cb(skb); /* restore skb->cb */ ++ ++ skb->imq_flags =3D 0; ++ skb->destructor =3D NULL; ++ ++ imq_done_check_queue_mapping(skb, dev); ++ ++ nf_reinject(entry, NF_ACCEPT); ++ ++ return NETDEV_TX_OK; ++} ++ ++static struct net_device *get_imq_device_by_index(int index) ++{ ++ struct net_device *dev =3D NULL; ++ struct net *net; ++ char buf[8]; ++ ++ /* get device by name and cache result */ ++ snprintf(buf, sizeof(buf), "imq%d", index); ++ ++ /* Search device from all namespaces. */ ++ for_each_net(net) { ++ dev =3D dev_get_by_name(net, buf); ++ if (dev) ++ break; ++ } ++ ++ if (WARN_ON_ONCE(dev =3D=3D NULL)) { ++ /* IMQ device not found. Exotic config? */ ++ return ERR_PTR(-ENODEV); ++ } ++ ++ imq_devs_cache[index] =3D dev; ++ dev_put(dev); ++ ++ return dev; ++} ++ ++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; ++ struct netdev_queue *txq; ++ spinlock_t *root_lock; ++ int users, index; ++ int retval =3D -EINVAL; ++ unsigned int orig_queue_index; ++ ++ index =3D 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); ++ retval =3D -EINVAL; ++ goto out; ++ } ++ ++ /* check for imq device by index from cache */ ++ dev =3D imq_devs_cache[index]; ++ if (unlikely(!dev)) { ++ dev =3D get_imq_device_by_index(index); ++ if (IS_ERR(dev)) { ++ retval =3D PTR_ERR(dev); ++ goto out; ++ } ++ } ++ ++ if (unlikely(!(dev->flags & IFF_UP))) { ++ entry->skb->imq_flags =3D 0; ++ nf_reinject(entry, NF_ACCEPT); ++ retval =3D 0; ++ goto out; ++ } ++ dev->last_rx =3D jiffies; ++ ++ skb =3D entry->skb; ++ skb_orig =3D NULL; ++ ++ /* skb has owner? =3D> make clone */ ++ if (unlikely(skb->destructor)) { ++ skb_orig =3D skb; ++ skb =3D skb_clone(skb, GFP_ATOMIC); ++ if (unlikely(!skb)) { ++ retval =3D -ENOMEM; ++ goto out; ++ } ++ entry->skb =3D skb; ++ } ++ ++ skb->nf_queue_entry =3D entry; ++ ++ dev->stats.rx_bytes +=3D skb->len; ++ dev->stats.rx_packets++; ++ ++ if (!skb->dev) { ++ /* skb->dev =3D=3D NULL causes problems, try the find cause. */ ++ if (net_ratelimit()) { ++ dev_warn(&dev->dev, ++ "received packet with skb->dev =3D=3D NULL\n"); ++ dump_stack(); ++ } ++ ++ skb->dev =3D dev; ++ } ++ ++ /* Disables softirqs for lock below */ ++ rcu_read_lock_bh(); ++ ++ /* Multi-queue selection */ ++ orig_queue_index =3D skb_get_queue_mapping(skb); ++ txq =3D imq_select_queue(dev, skb); ++ ++ q =3D rcu_dereference(txq->qdisc); ++ if (unlikely(!q->enqueue)) ++ goto packet_not_eaten_by_imq_dev; ++ ++ root_lock =3D qdisc_lock(q); ++ spin_lock(root_lock); ++ ++ users =3D atomic_read(&skb->users); ++ ++ skb_shared =3D skb_get(skb); /* increase reference count by one */ ++ skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will ++ overwrite it */ ++ qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */ ++ ++ if (likely(atomic_read(&skb_shared->users) =3D=3D users + 1)) { ++ kfree_skb(skb_shared); /* decrease reference count by one */ ++ ++ skb->destructor =3D &imq_skb_destructor; ++ ++ /* cloned? */ ++ if (unlikely(skb_orig)) ++ kfree_skb(skb_orig); /* free original */ ++ ++ spin_unlock(root_lock); ++ rcu_read_unlock_bh(); ++ ++ /* schedule qdisc dequeue */ ++ __netif_schedule(q); ++ ++ retval =3D 0; ++ goto out; ++ } else { ++ skb_restore_cb(skb_shared); /* restore skb->cb */ ++ skb->nf_queue_entry =3D NULL; ++ /* 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); ++ goto packet_not_eaten_by_imq_dev; ++ } ++ ++packet_not_eaten_by_imq_dev: ++ skb_set_queue_mapping(skb, orig_queue_index); ++ rcu_read_unlock_bh(); ++ ++ /* cloned? restore original */ ++ if (unlikely(skb_orig)) { ++ kfree_skb(skb); ++ entry->skb =3D skb_orig; ++ } ++ retval =3D -1; ++out: ++ return retval; ++} ++ ++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 *)) ++{ ++ return (pskb->imq_flags & IMQ_F_ENQUEUE) ? NF_IMQ_QUEUE : 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 const struct net_device_ops imq_netdev_ops =3D { ++ .ndo_open =3D imq_open, ++ .ndo_stop =3D imq_close, ++ .ndo_start_xmit =3D imq_dev_xmit, ++ .ndo_get_stats =3D imq_get_stats, ++}; ++ ++static void imq_setup(struct net_device *dev) ++{ ++ dev->netdev_ops =3D &imq_netdev_ops; ++ dev->type =3D ARPHRD_VOID; ++ dev->mtu =3D 16000; /* too small? */ ++ dev->tx_queue_len =3D 11000; /* too big? */ ++ dev->flags =3D IFF_NOARP; ++ dev->features =3D NETIF_F_SG | NETIF_F_FRAGLIST | ++ NETIF_F_GSO | NETIF_F_HW_CSUM | ++ NETIF_F_HIGHDMA; ++ dev->priv_flags &=3D ~(IFF_XMIT_DST_RELEASE | ++ IFF_TX_SKB_SHARING); ++} ++ ++static int imq_validate(struct nlattr *tb[], struct nlattr *data[]) ++{ ++ int ret =3D 0; ++ ++ if (tb[IFLA_ADDRESS]) { ++ if (nla_len(tb[IFLA_ADDRESS]) !=3D ETH_ALEN) { ++ ret =3D -EINVAL; ++ goto end; ++ } ++ if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) { ++ ret =3D -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 =3D { ++ .kind =3D "imq", ++ .priv_size =3D 0, ++ .setup =3D imq_setup, ++ .validate =3D imq_validate, ++}; ++ ++static const struct nf_queue_handler imq_nfqh =3D { ++ .name =3D "imq", ++ .outfn =3D imq_nf_queue, ++}; ++ ++static int __init imq_init_hooks(void) ++{ ++ int ret; ++ ++ nf_register_queue_imq_handler(&imq_nfqh); ++ ++ ret =3D nf_register_hooks(imq_ops, ARRAY_SIZE(imq_ops)); ++ if (ret < 0) ++ nf_unregister_queue_imq_handler(); ++ ++ return ret; ++} ++ ++static int __init imq_init_one(int index) ++{ ++ struct net_device *dev; ++ int ret; ++ ++ dev =3D alloc_netdev_mq(0, "imq%d", imq_setup, numqueues); ++ if (!dev) ++ return -ENOMEM; ++ ++ ret =3D dev_alloc_name(dev, dev->name); ++ if (ret < 0) ++ goto fail; ++ ++ dev->rtnl_link_ops =3D &imq_link_ops; ++ ret =3D 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; ++ } ++ ++ if (numqueues < 1 || numqueues > IMQ_MAX_QUEUES) { ++ printk(KERN_ERR "IMQ: numqueues has to be betweed 1 and %u\n", ++ IMQ_MAX_QUEUES); ++ return -EINVAL; ++ } ++ ++ get_random_bytes(&imq_hashrnd, sizeof(imq_hashrnd)); ++ ++ rtnl_lock(); ++ err =3D __rtnl_link_register(&imq_link_ops); ++ ++ for (i =3D 0; i < numdevs && !err; i++) ++ err =3D 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 =3D imq_init_devs(); ++ if (err) { ++ printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n"); ++ return err; ++ } ++ ++ err =3D 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. " ++ "(numdevs =3D %d, numqueues =3D %d)\n", numdevs, numqueues); ++ ++#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) ++{ ++ nf_unregister_hooks(imq_ops, ARRAY_SIZE(imq_ops)); ++ 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_param(numqueues, int, 0); ++MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices wil= l " ++ "be created)"); ++MODULE_PARM_DESC(numqueues, "number of queues per IMQ device"); ++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"); ++ +diff -uNr linux-3.2/drivers/net/Kconfig linux-3.2-imq/drivers/net/Kconfig +--- linux-3.2/drivers/net/Kconfig 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/drivers/net/Kconfig 2011-11-04 11:12:52.106390309 +0200 +@@ -90,6 +90,125 @@ + To compile this driver as a module, choose M here: the module + will be called eql. If unsure, say N. +=20 ++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 setting 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 setting 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 setting 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 setting 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 setting 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 setting 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 NET_FC + bool "Fibre Channel driver support" + depends on SCSI && PCI +diff -uNr linux-3.2/drivers/net/Makefile linux-3.2-imq/drivers/net/Makefile +--- linux-3.2/drivers/net/Makefile 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/drivers/net/Makefile 2011-11-04 11:12:52.106390309 +0200 +@@ -8,6 +8,7 @@=20 + obj-$(CONFIG_BONDING) +=3D bonding/ + obj-$(CONFIG_DUMMY) +=3D dummy.o + obj-$(CONFIG_EQUALIZER) +=3D eql.o ++obj-$(CONFIG_IMQ) +=3D imq.o + obj-$(CONFIG_IFB) +=3D ifb.o + obj-$(CONFIG_MACVLAN) +=3D macvlan.o + obj-$(CONFIG_MACVTAP) +=3D macvtap.o +diff -uNr linux-3.2/include/linux/imq.h linux-3.2-imq/include/linux/imq.h +--- linux-3.2/include/linux/imq.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.2-imq/include/linux/imq.h 2011-11-04 11:12:52.109723710 +0200 +@@ -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 */ ++ +diff -uNr linux-3.2/include/linux/netfilter/xt_IMQ.h linux-3.2-imq/include/l= inux/netfilter/xt_IMQ.h +--- linux-3.2/include/linux/netfilter/xt_IMQ.h 1970-01-01 02:00:00.000000000= +0200 ++++ linux-3.2-imq/include/linux/netfilter/xt_IMQ.h 2011-11-04 11:12:52.10972= 3710 +0200 +@@ -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 */ ++ +diff -uNr linux-3.2/include/linux/netfilter.h linux-3.2-imq/include/linux/ne= tfilter.h +--- linux-3.2/include/linux/netfilter.h 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/include/linux/netfilter.h 2011-11-04 11:12:52.109723710 +0= 200 +@@ -22,7 +22,8 @@ + #define NF_QUEUE 3 + #define NF_REPEAT 4 + #define NF_STOP 5 +-#define NF_MAX_VERDICT NF_STOP ++#define NF_IMQ_QUEUE 6 ++#define NF_MAX_VERDICT NF_IMQ_QUEUE +=20 + /* we overload the higher bits for encoding auxiliary data such as the queue + * number or errno values. Not nice, but better than additional function +diff -uNr linux-3.2/include/linux/netfilter_ipv4/ipt_IMQ.h linux-3.2-imq/inc= lude/linux/netfilter_ipv4/ipt_IMQ.h +--- linux-3.2/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 02:00:00.000= 000000 +0200 ++++ linux-3.2-imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2011-11-04 11:12:52= .109723710 +0200 +@@ -0,0 +1,10 @@ ++#ifndef _IPT_IMQ_H ++#define _IPT_IMQ_H ++ ++/* Backwards compatibility for old userspace */ ++#include ++ ++#define ipt_imq_info xt_imq_info ++ ++#endif /* _IPT_IMQ_H */ ++ +diff -uNr linux-3.2/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-3.2-imq/in= clude/linux/netfilter_ipv6/ip6t_IMQ.h +--- linux-3.2/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 02:00:00.00= 0000000 +0200 ++++ linux-3.2-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2011-11-04 11:12:5= 2.113057113 +0200 +@@ -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 */ ++ +diff -uNr linux-3.2/include/linux/skbuff.h linux-3.2-imq/include/linux/skbuf= f.h +--- linux-3.2/include/linux/skbuff.h 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/include/linux/skbuff.h 2011-11-04 11:12:52.116390515 +0200 +@@ -30,6 +30,9 @@ + #include + #include + #include ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++#include ++#endif +=20 + /* Don't change this without changing skb_csum_unnecessary! */ + #define CHECKSUM_NONE 0 +@@ -386,6 +389,9 @@ + * first. This is owned by whoever has the skb queued ATM. + */ + char cb[48] __aligned(8); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ void *cb_next; ++#endif +=20 + unsigned long _skb_refdst; + #ifdef CONFIG_XFRM +@@ -424,6 +430,9 @@ + #ifdef NET_SKBUFF_NF_DEFRAG_NEEDED + struct sk_buff *nfct_reasm; + #endif ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ struct nf_queue_entry *nf_queue_entry; ++#endif + #ifdef CONFIG_BRIDGE_NETFILTER + struct nf_bridge_info *nf_bridge; + #endif +@@ -449,6 +458,10 @@ +=20 + /* 0/13 bit hole */ +=20 ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ __u8 imq_flags:IMQ_F_BITS; ++#endif ++ + #ifdef CONFIG_NET_DMA + dma_cookie_t dma_cookie; + #endif +@@ -535,6 +548,12 @@ + return (struct rtable *)skb_dst(skb); + } +=20 ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++extern int skb_save_cb(struct sk_buff *skb); ++extern int skb_restore_cb(struct sk_buff *skb); ++#endif ++ + extern void kfree_skb(struct sk_buff *skb); + extern void consume_skb(struct sk_buff *skb); + extern void __kfree_skb(struct sk_buff *skb); +@@ -2368,6 +2387,10 @@ + dst->nfct_reasm =3D src->nfct_reasm; + nf_conntrack_get_reasm(src->nfct_reasm); + #endif ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ dst->imq_flags =3D src->imq_flags; ++ dst->nf_queue_entry =3D src->nf_queue_entry; ++#endif + #ifdef CONFIG_BRIDGE_NETFILTER + dst->nf_bridge =3D src->nf_bridge; + nf_bridge_get(src->nf_bridge); +diff -uNr linux-3.2/include/net/netfilter/nf_queue.h linux-3.2-imq/include/n= et/netfilter/nf_queue.h +--- linux-3.2/include/net/netfilter/nf_queue.h 2011-10-24 10:10:05.000000000= +0300 ++++ linux-3.2-imq/include/net/netfilter/nf_queue.h 2011-11-04 11:12:52.11639= 0515 +0200 +@@ -30,5 +30,11 @@ + 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 +=20 + #endif /* _NF_QUEUE_H */ +diff -uNr linux-3.2/net/core/dev.c linux-3.2-imq/net/core/dev.c +--- linux-3.2/net/core/dev.c 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/net/core/dev.c 2011-11-04 11:12:52.119723915 +0200 +@@ -98,6 +98,9 @@ + #include + #include + #include ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++#include ++#endif + #include + #include + #include +@@ -2185,7 +2188,12 @@ + if (dev->priv_flags & IFF_XMIT_DST_RELEASE) + skb_dst_drop(skb); +=20 ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ if (!list_empty(&ptype_all) && ++ !(skb->imq_flags & IMQ_F_ENQUEUE)) ++#else + if (!list_empty(&ptype_all)) ++#endif + dev_queue_xmit_nit(skb, dev); +=20 + skb_orphan_try(skb); +diff -uNr linux-3.2/net/core/skbuff.c linux-3.2-imq/net/core/skbuff.c +--- linux-3.2/net/core/skbuff.c 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/net/core/skbuff.c 2011-11-04 11:12:52.123057315 +0200 +@@ -73,6 +73,9 @@ +=20 + static struct kmem_cache *skbuff_head_cache __read_mostly; + static struct kmem_cache *skbuff_fclone_cache __read_mostly; ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++static struct kmem_cache *skbuff_cb_store_cache __read_mostly; ++#endif +=20 + static void sock_pipe_buf_release(struct pipe_inode_info *pipe, + struct pipe_buffer *buf) +@@ -92,6 +95,82 @@ + return 1; + } +=20 ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++/* Control buffer save/restore for IMQ devices */ ++struct skb_cb_table { ++ char cb[48] __aligned(8); ++ void *cb_next; ++ atomic_t refcnt; ++}; ++ ++static DEFINE_SPINLOCK(skb_cb_store_lock); ++ ++int skb_save_cb(struct sk_buff *skb) ++{ ++ struct skb_cb_table *next; ++ ++ next =3D kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC); ++ if (!next) ++ return -ENOMEM; ++ ++ BUILD_BUG_ON(sizeof(skb->cb) !=3D sizeof(next->cb)); ++ ++ memcpy(next->cb, skb->cb, sizeof(skb->cb)); ++ next->cb_next =3D skb->cb_next; ++ ++ atomic_set(&next->refcnt, 1); ++ ++ skb->cb_next =3D next; ++ return 0; ++} ++EXPORT_SYMBOL(skb_save_cb); ++ ++int skb_restore_cb(struct sk_buff *skb) ++{ ++ struct skb_cb_table *next; ++ ++ if (!skb->cb_next) ++ return 0; ++ ++ next =3D skb->cb_next; ++ ++ BUILD_BUG_ON(sizeof(skb->cb) !=3D sizeof(next->cb)); ++ ++ memcpy(skb->cb, next->cb, sizeof(skb->cb)); ++ skb->cb_next =3D next->cb_next; ++ ++ spin_lock(&skb_cb_store_lock); ++ ++ if (atomic_dec_and_test(&next->refcnt)) ++ kmem_cache_free(skbuff_cb_store_cache, next); ++ ++ spin_unlock(&skb_cb_store_lock); ++ ++ return 0; ++} ++EXPORT_SYMBOL(skb_restore_cb); ++ ++static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *_= _old) ++{ ++ struct skb_cb_table *next; ++ struct sk_buff *old; ++ ++ if (!__old->cb_next) { ++ new->cb_next =3D NULL; ++ return; ++ } ++ ++ spin_lock(&skb_cb_store_lock); ++ ++ old =3D (struct sk_buff *)__old; ++ ++ next =3D old->cb_next; ++ atomic_inc(&next->refcnt); ++ new->cb_next =3D next; ++ ++ spin_unlock(&skb_cb_store_lock); ++} ++#endif +=20 + /* Pipe buffer operations for a socket. */ + static const struct pipe_buf_operations sock_pipe_buf_ops =3D { +@@ -403,6 +482,26 @@ + WARN_ON(in_irq()); + skb->destructor(skb); + } ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ /* This should not happen. When it does, avoid memleak by restoring ++ the chain of cb-backups. */ ++ while (skb->cb_next !=3D NULL) { ++ if (net_ratelimit()) ++ printk(KERN_WARNING "IMQ: kfree_skb: skb->cb_next: " ++ "%08x\n", (unsigned int)skb->cb_next); ++ ++ skb_restore_cb(skb); ++ } ++ /* This should not happen either, nf_queue_entry is nullified in ++ * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are ++ * leaking entry pointers, maybe memory. We don't know if this is ++ * pointer to already freed memory, or should this be freed. ++ * If this happens we need to add refcounting, etc for nf_queue_entry. ++ */ ++ if (skb->nf_queue_entry && net_ratelimit()) ++ printk(KERN_WARNING ++ "IMQ: kfree_skb: skb->nf_queue_entry !=3D NULL"); ++#endif + #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) + nf_conntrack_put(skb->nfct); + #endif +@@ -547,6 +646,9 @@ + new->sp =3D secpath_get(old->sp); + #endif + memcpy(new->cb, old->cb, sizeof(old->cb)); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ skb_copy_stored_cb(new, old); ++#endif + new->csum =3D old->csum; + new->local_df =3D old->local_df; + new->pkt_type =3D old->pkt_type; +@@ -2907,6 +3009,13 @@ + 0, + SLAB_HWCACHE_ALIGN|SLAB_PANIC, + NULL); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ skbuff_cb_store_cache =3D kmem_cache_create("skbuff_cb_store_cache", ++ sizeof(struct skb_cb_table), ++ 0, ++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, ++ NULL); ++#endif + } +=20 + /** +diff -uNr linux-3.2/net/ipv6/ip6_output.c linux-3.2-imq/net/ipv6/ip6_output.c +--- linux-3.2/net/ipv6/ip6_output.c 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/net/ipv6/ip6_output.c 2011-11-04 11:12:52.123057315 +0200 +@@ -102,9 +102,6 @@ + struct net_device *dev =3D dst->dev; + struct neighbour *neigh; +=20 +- skb->protocol =3D htons(ETH_P_IPV6); +- skb->dev =3D dev; +- + if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) { + struct inet6_dev *idev =3D ip6_dst_idev(skb_dst(skb)); +=20 +@@ -170,6 +167,11 @@ + return 0; + } +=20 ++ /* IMQ-patch: moved setting skb->dev and skb->protocol from ++ * ip6_finish_output2 to fix crashing at netif_skb_features(). */ ++ skb->protocol =3D htons(ETH_P_IPV6); ++ skb->dev =3D dev; ++ + return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb, NULL, dev, + ip6_finish_output, + !(IP6CB(skb)->flags & IP6SKB_REROUTED)); +diff -uNr linux-3.2/net/netfilter/core.c linux-3.2-imq/net/netfilter/core.c +--- linux-3.2/net/netfilter/core.c 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/net/netfilter/core.c 2011-11-04 11:12:52.123057315 +0200 +@@ -179,9 +179,11 @@ + ret =3D NF_DROP_GETERR(verdict); + if (ret =3D=3D 0) + ret =3D -EPERM; +- } else if ((verdict & NF_VERDICT_MASK) =3D=3D NF_QUEUE) { ++ } else if ((verdict & NF_VERDICT_MASK) =3D=3D NF_QUEUE || ++ (verdict & NF_VERDICT_MASK) =3D=3D NF_IMQ_QUEUE) { + int err =3D nf_queue(skb, elem, pf, hook, indev, outdev, okfn, +- verdict >> NF_VERDICT_QBITS); ++ verdict >> NF_VERDICT_QBITS, ++ verdict & NF_VERDICT_MASK); + if (err < 0) { + if (err =3D=3D -ECANCELED) + goto next_hook; +diff -uNr linux-3.2/net/netfilter/Kconfig linux-3.2-imq/net/netfilter/Kconfig +--- linux-3.2/net/netfilter/Kconfig 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/net/netfilter/Kconfig 2011-11-04 11:12:52.123057315 +0200 +@@ -506,6 +506,18 @@ + For more information on the LEDs available on your system, see + Documentation/leds/leds-class.txt +=20 ++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=3Dn ++ 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_ADVANCED +diff -uNr linux-3.2/net/netfilter/Makefile linux-3.2-imq/net/netfilter/Makef= ile +--- linux-3.2/net/netfilter/Makefile 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/net/netfilter/Makefile 2011-11-04 11:12:52.123057315 +0200 +@@ -56,6 +56,7 @@ + obj-$(CONFIG_NETFILTER_XT_TARGET_CT) +=3D xt_CT.o + obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) +=3D xt_DSCP.o + obj-$(CONFIG_NETFILTER_XT_TARGET_HL) +=3D xt_HL.o ++obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) +=3D xt_IMQ.o + obj-$(CONFIG_NETFILTER_XT_TARGET_LED) +=3D xt_LED.o + obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) +=3D xt_NFLOG.o + obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) +=3D xt_NFQUEUE.o +diff -uNr linux-3.2/net/netfilter/nf_internals.h linux-3.2-imq/net/netfilter= /nf_internals.h +--- linux-3.2/net/netfilter/nf_internals.h 2011-10-24 10:10:05.000000000 +03= 00 ++++ linux-3.2-imq/net/netfilter/nf_internals.h 2011-11-04 11:12:52.123057315= +0200 +@@ -29,7 +29,7 @@ + struct net_device *indev, + struct net_device *outdev, + int (*okfn)(struct sk_buff *), +- unsigned int queuenum); ++ unsigned int queuenum, unsigned int queuetype); + extern int __init netfilter_queue_init(void); +=20 + /* nf_log.c */ +diff -uNr linux-3.2/net/netfilter/nf_queue.c linux-3.2-imq/net/netfilter/nf_= queue.c +--- linux-3.2/net/netfilter/nf_queue.c 2011-10-24 10:10:05.000000000 +0300 ++++ linux-3.2-imq/net/netfilter/nf_queue.c 2011-11-04 11:12:52.123057315 +02= 00 +@@ -22,6 +22,26 @@ +=20 + static DEFINE_MUTEX(queue_handler_mutex); +=20 ++#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_GPL(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_GPL(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(u_int8_t pf, const struct nf_queue_handler *q= h) +@@ -92,7 +112,7 @@ + } + EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers); +=20 +-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) +@@ -112,6 +132,7 @@ + /* Drop reference to owner of hook which queued us. */ + module_put(entry->elem->owner); + } ++EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs); +=20 + /* + * Any packet that leaves via this function must come back +@@ -123,7 +144,8 @@ + struct net_device *indev, + struct net_device *outdev, + int (*okfn)(struct sk_buff *), +- unsigned int queuenum) ++ unsigned int queuenum, ++ unsigned int queuetype) + { + int status =3D -ENOENT; + struct nf_queue_entry *entry =3D NULL; +@@ -137,7 +159,17 @@ + /* QUEUE =3D=3D DROP if no one is waiting, to be safe. */ + rcu_read_lock(); +=20 +- qh =3D rcu_dereference(queue_handler[pf]); ++ if (queuetype =3D=3D NF_IMQ_QUEUE) { ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ qh =3D rcu_dereference(queue_imq_handler); ++#else ++ BUG(); ++ goto err_unlock; ++#endif ++ } else { ++ qh =3D rcu_dereference(queue_handler[pf]); ++ } ++ + if (!qh) { + status =3D -ESRCH; + goto err_unlock; +@@ -209,7 +241,8 @@ + struct net_device *indev, + struct net_device *outdev, + int (*okfn)(struct sk_buff *), +- unsigned int queuenum) ++ unsigned int queuenum, ++ unsigned int queuetype) + { + struct sk_buff *segs; + int err; +@@ -217,7 +250,7 @@ +=20 + if (!skb_is_gso(skb)) + return __nf_queue(skb, elem, pf, hook, indev, outdev, okfn, +- queuenum); ++ queuenum, queuetype); +=20 + switch (pf) { + case NFPROTO_IPV4: +@@ -244,7 +277,7 @@ + segs->next =3D NULL; + if (err =3D=3D 0) + err =3D __nf_queue(segs, elem, pf, hook, indev, +- outdev, okfn, queuenum); ++ outdev, okfn, queuenum, queuetype); + if (err =3D=3D 0) + queued++; + else +@@ -299,9 +332,11 @@ + local_bh_enable(); + break; + case NF_QUEUE: ++ case NF_IMQ_QUEUE: + err =3D __nf_queue(skb, elem, entry->pf, entry->hook, + entry->indev, entry->outdev, entry->okfn, +- verdict >> NF_VERDICT_QBITS); ++ verdict >> NF_VERDICT_QBITS, ++ verdict & NF_VERDICT_MASK); + if (err < 0) { + if (err =3D=3D -ECANCELED) + goto next_hook; +diff -uNr linux-3.2/net/netfilter/xt_IMQ.c linux-3.2-imq/net/netfilter/xt_IM= Q.c +--- linux-3.2/net/netfilter/xt_IMQ.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.2-imq/net/netfilter/xt_IMQ.c 2011-11-04 11:12:52.123057315 +0200 +@@ -0,0 +1,74 @@ ++/* ++ * 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 xt_action_param *par) ++{ ++ const struct xt_imq_info *mr =3D par->targinfo; ++ ++ pskb->imq_flags =3D (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE; ++ ++ return XT_CONTINUE; ++} ++ ++static int imq_checkentry(const struct xt_tgchk_param *par) ++{ ++ struct xt_imq_info *mr =3D par->targinfo; ++ ++ if (mr->todev > IMQ_MAX_DEVS - 1) { ++ printk(KERN_WARNING ++ "IMQ: invalid device specified, highest is %u\n", ++ IMQ_MAX_DEVS - 1); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static struct xt_target xt_imq_reg[] __read_mostly =3D { ++ { ++ .name =3D "IMQ", ++ .family =3D AF_INET, ++ .checkentry =3D imq_checkentry, ++ .target =3D imq_target, ++ .targetsize =3D sizeof(struct xt_imq_info), ++ .table =3D "mangle", ++ .me =3D THIS_MODULE ++ }, ++ { ++ .name =3D "IMQ", ++ .family =3D AF_INET6, ++ .checkentry =3D imq_checkentry, ++ .target =3D imq_target, ++ .targetsize =3D sizeof(struct xt_imq_info), ++ .table =3D "mangle", ++ .me =3D 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"); ++ diff --git a/src/patches/linux-3.2-panda-reboot.patch b/src/patches/linux-3.2= -panda-reboot.patch new file mode 100644 index 0000000..8e37837 --- /dev/null +++ b/src/patches/linux-3.2-panda-reboot.patch @@ -0,0 +1,29 @@ +With commit 3d3f78d752bf, reboot seems to broken on ARM +machines. CPU dies while doing flush_pmd_entry() as part of +setup_mm_for_reboot() + +I know this is not the fix but intention is to report the +issue and also provide temporary fix till it get fixed correctly + +Signed-off-by: Santosh Shilimkar +Reported-by: Anand Gadiyar +--- +Tested with OMAP4 device. + + arch/arm/kernel/process.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c +index e76fcaa..ac370b2 100644 +--- a/arch/arm/kernel/process.c ++++ b/arch/arm/kernel/process.c +@@ -247,7 +247,6 @@ void machine_power_off(void) +=20 + void machine_restart(char *cmd) + { +- machine_shutdown(); + arm_pm_restart(reboot_mode, cmd); + } +=20 +--=20 +1.6.0.4 hooks/post-receive -- IPFire 2.x development tree --===============4188210553357942686==--