Changeset 19323

Timestamp:

06/05/12 02:23:26 (13 months ago)

Author:

BrainSlayer

Message:

3.4.1-rc1 -> 3.4.1

Location:

src/linux/universal/linux-3.4

Files:

• .config_mr3240 (added)
• .config_wr741v4 (modified) (47 diffs)
• Makefile (modified) (1 diff)
• arch/mips/ar7100/setup.c (modified) (1 diff)
• drivers/net/wireless/ipw2x00/ipw2200.c (modified) (3 diffs)
• drivers/net/wireless/iwlwifi/iwl-6000.c (modified) (2 diffs)

src/linux/universal/linux-3.4/.config_wr741v4

@@ -1 +1 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/mips 3.2.12-rc1 Kernel Configuration
+# Linux/mips 3.4.1-rc1 Kernel Configuration
 #
 CONFIG_MIPS=y
@@ -58 +58 @@
 # CONFIG_MACH_AR7100 is not set
 # CONFIG_MACH_AR7240 is not set
+# CONFIG_NLM_XLP_BOARD is not set
 # CONFIG_ALCHEMY_GPIO_INDIRECT is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -74 +75 @@
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
 # CONFIG_MIPS_FPU_EMU is not set
 # CONFIG_MIPS_MACHINE is not set
@@ -112 +112 @@
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
@@ -184 +186 @@
 CONFIG_TINY_RCU=y
 # CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -198 +200 @@
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
-# CONFIG_CRASHLOG is not set
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -235 +236 @@
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
+CONFIG_JUMP_LABEL=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -263 +264 @@
 
 #
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
 # IO Schedulers
 #
@@ -277 +284 @@
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@@ -313 +319 @@
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 # CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
@@ -325 +332 @@
 # CONFIG_PM_RUNTIME is not set
 CONFIG_NET=y
+CONFIG_ETHERNET_PACKET_MANGLE=y
 
 #
@@ -331 +339 @@
 CONFIG_PACKET=y
 CONFIG_UNIX=y
+# CONFIG_UNIX_DIAG is not set
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
@@ -418 +427 @@
 #
 CONFIG_NETFILTER_NETLINK=y
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
 # CONFIG_NETFILTER_NETLINK_QUEUE is not set
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_PROCFS=y
 CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
 # CONFIG_NF_CONNTRACK_TIMESTAMP is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set
@@ -441 +453 @@
 CONFIG_NF_CONNTRACK_RTSP=y
 # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
 # CONFIG_NETFILTER_TPROXY is not set
 CONFIG_NETFILTER_XTABLES=y
@@ -462 +475 @@
 # CONFIG_NETFILTER_XT_TARGET_LED is not set
 CONFIG_NETFILTER_XT_TARGET_IMQ=m
+CONFIG_NETFILTER_XT_TARGET_LOG=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
@@ -486 +500 @@
 # CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=y
 CONFIG_NETFILTER_XT_MATCH_ESP=y
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
@@ -498 +513 @@
 CONFIG_NETFILTER_XT_MATCH_MARK=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -529 +545 @@
 CONFIG_IP_NF_MATCH_AH=y
 CONFIG_IP_NF_MATCH_ECN=y
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
 CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_FILTER=y
@@ -534 +551 @@
 CONFIG_IP_NF_TARGET_TRIGGER=y
 CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_TARGET_LOG=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 CONFIG_NF_NAT=y
@@ -633 +649 @@
 # CONFIG_NET_SCH_QFQ is not set
 CONFIG_NET_SCH_INGRESS=y
+# CONFIG_NET_SCH_PLUG is not set
 
 #
@@ -664 +681 @@
 # CONFIG_DCB is not set
 # CONFIG_BATMAN_ADV is not set
+# CONFIG_OPENVSWITCH is not set
+CONFIG_BQL=y
 
 #
@@ -711 +730 @@
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
+# CONFIG_DMA_SHARED_BUFFER is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
@@ -770 +791 @@
 # Disk-On-Chip Device Drivers
 #
-# 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_FLASH_16MB is not set
@@ -791 +809 @@
 # CONFIG_PARPORT is not set
 # CONFIG_BLK_DEV is not set
-# CONFIG_MISC_DEVICES is not set
+
+#
+# Misc devices
+#
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_93CX6 is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+
+#
+# Altera FPGA firmware download module
+#
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -812 +849 @@
 CONFIG_MII=y
 # CONFIG_IFB is not set
+# CONFIG_NET_TEAM is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_NETCONSOLE is not set
@@ -830 +868 @@
 CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
 # CONFIG_NET_VENDOR_CHELSIO is not set
 # CONFIG_DM9000 is not set
@@ -869 +908 @@
 # CONFIG_NET_VENDOR_STMICRO is not set
 CONFIG_PHYLIB=y
+CONFIG_MDIO_BOARDINFO=y
 CONFIG_SWCONFIG=y
 
@@ -874 +914 @@
 # MII PHY device drivers
 #
+# CONFIG_AMD_PHY is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
@@ -914 +955 @@
 # CONFIG_WAN is not set
 # CONFIG_ISDN is not set
-# CONFIG_PHONE is not set
 
 #
@@ -945 +985 @@
 #
 # CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_AR933X=y
+CONFIG_SERIAL_AR933X_CONSOLE=y
+CONFIG_SERIAL_AR933X_NR_UARTS=1
 
 #
@@ -955 +998 @@
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
-CONFIG_SERIAL_AR933X=y
-CONFIG_SERIAL_AR933X_CONSOLE=y
-CONFIG_SERIAL_AR933X_NR_UARTS=1
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_IPMI_HANDLER is not set
@@ -968 +1008 @@
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
+# CONFIG_HSI is not set
 
 #
@@ -993 +1034 @@
 #
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IT8761E is not set
 
 #
@@ -1019 +1059 @@
 # CONFIG_THERMAL is not set
 CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_CORE is not set
+CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -1057 +1097 @@
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
+# CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_SOUND is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB_ARCH_HAS_XHCI is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
@@ -1075 +1114 @@
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_OT200 is not set
 CONFIG_LEDS_TRIGGERS=y
 
@@ -1103 +1143 @@
 # CONFIG_VIRTIO_BALLOON is not set
 # CONFIG_VIRTIO_MMIO is not set
+
+#
+# Microsoft Hyper-V guest support
+#
 # CONFIG_STAGING is not set
 
@@ -1109 +1153 @@
 #
 CONFIG_IOMMU_SUPPORT=y
+
+#
+# Remoteproc drivers (EXPERIMENTAL)
+#
+
+#
+# Rpmsg drivers (EXPERIMENTAL)
+#
 # CONFIG_VIRT_DRIVERS is not set
 # CONFIG_PM_DEVFREQ is not set
@@ -1187 +1239 @@
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_PSTORE is not set
@@ -1203 +1256 @@
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
 CONFIG_NLS=m
 CONFIG_NLS_DEFAULT="iso8859-1"
@@ -1270 +1317 @@
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_LKDTM is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1285 +1331 @@
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_TEST_KSTRTOX is not set
-CONFIG_EARLY_PRINTK=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyATH0,115200 root=1f02 rootfstype=squashfs noinitrd init=/sbin/init"
@@ -1355 +1400 @@
 # Digest
 #
-CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_GHASH is not set
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
@@ -1373 +1418 @@
 # Ciphers
 #
-CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=y
@@ -1414 +1459 @@
 #
 CONFIG_BITREVERSE=y
+CONFIG_GENERIC_IO=y
 CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
@@ -1419 +1465 @@
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
@@ -1433 +1484 @@
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_AVERAGE=y
 # CONFIG_CORDIC is not set
-# CONFIG_NLM_XLP_BOARD is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_UNIX_DIAG is not set
-# CONFIG_NETFILTER_NETLINK_ACCT is not set
-CONFIG_NF_CONNTRACK_PROCFS=y
-# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
-# CONFIG_IP_NF_MATCH_RPFILTER is not set
-# CONFIG_OPENVSWITCH is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_INTEL_MID_PTI is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_PCH_PHUB is not set
-# CONFIG_C2PORT is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_TI_ST is not set
-# CONFIG_NET_TEAM is not set
-# CONFIG_NET_CALXEDA_XGMAC is not set
-# CONFIG_LEDS_OT200 is not set
-# CONFIG_USB_EHCI_MV is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_INET_UDP_DIAG is not set
-# CONFIG_ANDROID is not set
-# CONFIG_NETPRIO_CGROUP is not set
-# CONFIG_OF_SELFTEST is not set
-# CONFIG_BLK_DEV_NVME is not set
-# CONFIG_STMMAC_PLATFORM is not set
-# CONFIG_STMMAC_PCI is not set
-# CONFIG_MICREL_KS8995MA is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_VIA_WDT is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_S5M_CORE is not set
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_RTLLIB is not set
-# CONFIG_AMILO_RFKILL is not set
-# CONFIG_CRYPTO_SERPENT_SSE2_586 is not set
-# CONFIG_X86_MDFLD is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_DYNAMIC_MEMSTART is not set
-# CONFIG_STRICT_DEVMEM is not set
-# CONFIG_RCU_FAST_NO_HZ is not set
-# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
-# CONFIG_USB_MV_UDC is not set
-# CONFIG_ATMEL_PWM is not set
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-
-CONFIG_JUMP_LABEL=y
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
-CONFIG_NETFILTER_XT_TARGET_LOG=y
-# CONFIG_NET_SCH_PLUG is not set
-# CONFIG_BPF_JIT is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_HSI is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_TWL6040_CORE is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_RC5T583 is not set
-# CONFIG_EXYNOS_VIDEO is not set
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_SERIAL_F81232 is not set
-# CONFIG_USB_SERIAL_METRO is not set
-# CONFIG_LEDS_PCA9633 is not set
-# CONFIG_USB_WPAN_HCD is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_SUNRPC_DEBUG is not set
-# CONFIG_CRC32_SELFTEST is not set
-# CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-# CONFIG_ARCH_S3C24XX is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_WP543 is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_USB_NET_QMI_WWAN is not set
-# CONFIG_IRQ_DOMAIN_DEBUG is not set

src/linux/universal/linux-3.4/Makefile

@@ -2 +2 @@
 PATCHLEVEL = 4
 SUBLEVEL = 1
-EXTRAVERSION = -rc1
+EXTRAVERSION =
 NAME = Saber-toothed Squirrel
 

src/linux/universal/linux-3.4/arch/mips/ar7100/setup.c

@@ -30 +30 @@
 #include <asm/processor.h>
 #include <asm/reboot.h>
-#include <asm/system.h>
 #include <asm/serial.h>
 #include <asm/traps.h>

src/linux/universal/linux-3.4/drivers/net/wireless/ipw2x00/ipw2200.c

@@ -11444 +11444 @@
 }
 
+/* Called by register_netdev() */
+static int ipw_net_init(struct net_device *dev)
+{
+        int rc = 0;
+        struct ipw_priv *priv = libipw_priv(dev);
+
+        mutex_lock(&priv->mutex);
+        if (ipw_up(priv))
+                rc = -EIO;
+        mutex_unlock(&priv->mutex);
+
+        return rc;
+}
+
 static int ipw_wdev_init(struct net_device *dev)
 {
@@ -11709 +11723 @@
 
 static const struct net_device_ops ipw_netdev_ops = {
+        .ndo_init               = ipw_net_init,
         .ndo_open               = ipw_net_open,
         .ndo_stop               = ipw_net_stop,
@@ -11833 +11848 @@
                 mutex_unlock(&priv->mutex);
                 goto out_release_irq;
-        }
-
-        if (ipw_up(priv)) {
-                mutex_unlock(&priv->mutex);
-                err = -EIO;
-                goto out_remove_sysfs;
         }
 

src/linux/universal/linux-3.4/drivers/net/wireless/iwlwifi/iwl-6000.c

@@ -337 +337 @@
         .fw_name_pre = IWL6005_FW_PRE,                          \
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,               \
-        .ucode_api_ok = IWL6000G2B_UCODE_API_OK,                \
+        .ucode_api_ok = IWL6000G2_UCODE_API_OK,                 \
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,               \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
@@ -391 +391 @@
         .fw_name_pre = IWL6030_FW_PRE,                          \
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,               \
-        .ucode_api_ok = IWL6000G2_UCODE_API_OK,                 \
+        .ucode_api_ok = IWL6000G2B_UCODE_API_OK,                \
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,               \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \