1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

Merge commit 'nbd/master' into xburst

This commit is contained in:
Lars-Peter Clausen
2010-02-26 00:52:46 +01:00
508 changed files with 96423 additions and 62473 deletions

View File

@@ -758,7 +758,7 @@ CONFIG_JOLIET=y
CONFIG_KMOD=y
# CONFIG_LAPB is not set
# CONFIG_LASAT is not set
# CONFIG_LBD is not set
CONFIG_LBD=y
# CONFIG_LDM_PARTITION is not set
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
@@ -1073,11 +1073,11 @@ CONFIG_NFSD_TCP=y
# CONFIG_NFSD_V2_ACL is not set
# CONFIG_NFSD_V3_ACL is not set
CONFIG_NFSD_V3=y
CONFIG_NFSD_V4=y
# CONFIG_NFSD_V4 is not set
# CONFIG_NFS_FS is not set
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V3=y
CONFIG_NFS_V4=y
# CONFIG_NFS_V4 is not set
# CONFIG_NFTL is not set
# CONFIG_NLS_ASCII is not set
# CONFIG_NLS_CODEPAGE_1250 is not set

View File

@@ -124,6 +124,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
# CONFIG_B43LEGACY is not set
# CONFIG_B44 is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
CONFIG_BASE_FULL=y
CONFIG_BASE_SMALL=0
# CONFIG_BASLER_EXCITE is not set
@@ -143,6 +144,7 @@ CONFIG_BCM43XX_DMA=y
# CONFIG_BCM43XX is not set
# CONFIG_BCM43XX_PIO_MODE is not set
CONFIG_BCM43XX_PIO=y
# CONFIG_BDI_SWITCH is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_BINFMT_AOUT is not set
@@ -161,11 +163,11 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_CS5535 is not set
# CONFIG_BLK_DEV_CS5536 is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_DELKIN is not set
# CONFIG_BLK_DEV_FD is not set
@@ -223,6 +225,7 @@ CONFIG_BLK_DEV=y
CONFIG_BLOCK=y
# CONFIG_BNX2 is not set
# CONFIG_BONDING is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_BOOT_TRACER is not set
# CONFIG_BPQETHER is not set
# CONFIG_BRIDGE_EBT_802_3 is not set
@@ -315,6 +318,7 @@ CONFIG_CLS_U32_MARK=y
CONFIG_CLS_U32_PERF=y
CONFIG_CMDLINE=""
# CONFIG_CODA_FS is not set
# CONFIG_CODE_PATCHING_SELFTEST is not set
# CONFIG_COMPAT_BRK is not set
CONFIG_COMPAT_NET_DEV_OPS=y
# CONFIG_CONFIGFS_FS is not set
@@ -405,10 +409,36 @@ CONFIG_CRYPTO_ZLIB=y
# CONFIG_DAB is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DCB is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_ERRORS is not set
CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_KERNEL is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_LIST is not set
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_SHIRQ is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_WRITECOUNT is not set
# CONFIG_DECNET is not set
CONFIG_DECOMPRESS_LZMA_NEEDED=y
# CONFIG_DEFAULT_AS is not set
@@ -425,6 +455,8 @@ CONFIG_DEFAULT_TCP_CONG="westwood"
# CONFIG_DEFAULT_VEGAS is not set
CONFIG_DEFAULT_WESTWOOD=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# CONFIG_DETECT_HUNG_TASK is not set
# CONFIG_DETECT_SOFTLOCKUP is not set
# CONFIG_DEVKMEM is not set
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_DGRS is not set
@@ -481,12 +513,14 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_EXT3_FS_XATTR is not set
# CONFIG_EXT4DEV_FS is not set
# CONFIG_EXT4_FS is not set
# CONFIG_EXT4DEV_COMPAT is not set
CONFIG_EXTRA_FIRMWARE=""
CONFIG_EXTRA_TARGETS=""
# CONFIG_FAIR_GROUP_SCHED is not set
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_FAT_FS is not set
# CONFIG_FAULT_INJECTION is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
@@ -568,6 +602,7 @@ CONFIG_FRAME_WARN=1024
# CONFIG_FTL is not set
# CONFIG_FTRACE is not set
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_FTR_FIXUP_SELFTEST is not set
# CONFIG_FUNCTION_TRACER is not set
# CONFIG_FUSE_FS is not set
# CONFIG_FUSION_FC is not set
@@ -1005,6 +1040,7 @@ CONFIG_JOLIET=y
CONFIG_KERNEL_LZMA=y
# CONFIG_KEXEC is not set
# CONFIG_KEYS is not set
# CONFIG_KGDB is not set
# CONFIG_KMEMTRACE is not set
CONFIG_KMOD=y
# CONFIG_KPROBES is not set
@@ -1012,7 +1048,7 @@ CONFIG_KMOD=y
# CONFIG_LAPB is not set
# CONFIG_LASAT is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_LBD is not set
CONFIG_LBD=y
# CONFIG_LCD_LTV350QV is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
@@ -1055,6 +1091,7 @@ CONFIG_LOCALVERSION=""
CONFIG_LOCKDEP_SUPPORT=y
# CONFIG_LOCKD is not set
CONFIG_LOCKD_V4=y
# CONFIG_LOCK_STAT is not set
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LOGIRUMBLEPAD2_FF is not set
# CONFIG_LOGITECH_FF is not set
@@ -1132,6 +1169,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MOUSE_PC110PAD is not set
# CONFIG_MSDOS_FS is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_MSI_BITMAP_SELFTEST is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AFS_PARTS is not set
# CONFIG_MTD_ALAUDA is not set
@@ -1405,11 +1443,11 @@ CONFIG_NFSD_TCP=y
# CONFIG_NFSD_V2_ACL is not set
# CONFIG_NFSD_V3_ACL is not set
CONFIG_NFSD_V3=y
CONFIG_NFSD_V4=y
# CONFIG_NFSD_V4 is not set
# CONFIG_NFS_FS is not set
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V3=y
CONFIG_NFS_V4=y
# CONFIG_NFS_V4 is not set
# CONFIG_NFTL is not set
# CONFIG_NILFS2_FS is not set
CONFIG_NL80211=y
@@ -1478,6 +1516,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_P54_COMMON is not set
CONFIG_PACKET_MMAP=y
CONFIG_PACKET=y
# CONFIG_PAGE_POISONING is not set
# CONFIG_PAGE_SIZE_16KB is not set
# CONFIG_PAGE_SIZE_32KB is not set
CONFIG_PAGE_SIZE_4KB=y
@@ -1493,11 +1532,11 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_CMD640_PCI is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CS5535 is not set
# CONFIG_PATA_CS5536 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
@@ -1538,6 +1577,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCF8575 is not set
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_ATMEL is not set
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
# CONFIG_PCIEASPM is not set
# CONFIG_PCI_HERMES is not set
@@ -1611,6 +1651,7 @@ CONFIG_PROC_KCORE=y
# CONFIG_PROC_PAGE_MONITOR is not set
CONFIG_PROC_SYSCTL=y
# CONFIG_PROFILING is not set
# CONFIG_PROVE_LOCKING is not set
# CONFIG_QEMU is not set
# CONFIG_QLA3XXX is not set
# CONFIG_QNX4FS_FS is not set
@@ -1638,6 +1679,7 @@ CONFIG_PROC_SYSCTL=y
CONFIG_RAMFS=y
# CONFIG_RAW_DRIVER is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RD_BZIP2 is not set
# CONFIG_RD_GZIP is not set
CONFIG_RD_LZMA=y
@@ -1710,7 +1752,10 @@ CONFIG_RTC_LIB=y
# CONFIG_RTL8366_SMI is not set
# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
# CONFIG_RTL8366S_PHY is not set
# CONFIG_RTL8366RB_PHY is not set
CONFIG_RT_MUTEXES=y
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_RUNTIME_DEBUG is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_S2IO is not set
# CONFIG_SAMPLES is not set
@@ -1733,6 +1778,8 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_SCC is not set
# CONFIG_SCHED_BFS is not set
CONFIG_SCHED_CFS=y
# CONFIG_SCHED_DEBUG is not set
# CONFIG_SCHEDSTATS is not set
# CONFIG_SCHED_TRACER is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_7000FASST is not set
@@ -2470,12 +2517,12 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_CS5345 is not set
# CONFIG_VIDEO_CS53L32A is not set
# CONFIG_VIDEO_CX231XX is not set
# CONFIG_VIDEO_CX2341X is not set
# CONFIG_VIDEO_CX25840 is not set
# CONFIG_VIDEO_CX88 is not set
# CONFIG_VIDEO_CS5345 is not set
# CONFIG_VIDEO_CS53L32A is not set
# CONFIG_VIDEO_DEV is not set
# CONFIG_VIDEO_DPC is not set
# CONFIG_VIDEO_EM28XX is not set
@@ -2591,6 +2638,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_RT is not set
# CONFIG_XFS_SECURITY is not set
# CONFIG_XIP_KERNEL is not set
# CONFIG_XMON is not set
# CONFIG_YAFFS_FS is not set
# CONFIG_YAM is not set
# CONFIG_YELLOWFIN is not set

View File

@@ -1049,8 +1049,7 @@ CONFIG_KMOD=y
# CONFIG_LAPB is not set
# CONFIG_LASAT is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_LBDAF is not set
# CONFIG_LBD is not set
CONFIG_LBDAF=y
# CONFIG_LCD_LTV350QV is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
@@ -1446,12 +1445,12 @@ CONFIG_NFSD_TCP=y
# CONFIG_NFSD_V2_ACL is not set
# CONFIG_NFSD_V3_ACL is not set
CONFIG_NFSD_V3=y
CONFIG_NFSD_V4=y
# CONFIG_NFSD_V4 is not set
# CONFIG_NFS_FS is not set
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V3=y
# CONFIG_NFS_V4_1 is not set
CONFIG_NFS_V4=y
# CONFIG_NFS_V4 is not set
# CONFIG_NFTL is not set
# CONFIG_NILFS2_FS is not set
CONFIG_NL80211=y
@@ -1766,6 +1765,7 @@ CONFIG_RTC_LIB=y
# CONFIG_RTL8366_SMI is not set
# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
# CONFIG_RTL8366S_PHY is not set
# CONFIG_RTL8366RB_PHY is not set
CONFIG_RT_MUTEXES=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_S2IO is not set

View File

@@ -491,6 +491,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_DL2K is not set
# CONFIG_DLM is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_DMADEVICES is not set
# CONFIG_DMA_ENGINE is not set
# CONFIG_DMASCC is not set
@@ -607,6 +608,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_FB_SYS_IMAGEBLIT is not set
# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_UDL is not set
# CONFIG_FB_VGA16 is not set
# CONFIG_FB_VIA is not set
# CONFIG_FB_VIRTUAL is not set
@@ -1107,8 +1109,7 @@ CONFIG_KMOD=y
# CONFIG_LAPB is not set
# CONFIG_LASAT is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_LBDAF is not set
# CONFIG_LBD is not set
CONFIG_LBDAF=y
# CONFIG_LDM_PARTITION is not set
# CONFIG_LEDS_ALIX is not set
# CONFIG_LEDS_BD2802 is not set
@@ -1314,6 +1315,7 @@ CONFIG_MTD_ROOTFS_SPLIT=y
# CONFIG_MTD_TESTS is not set
# CONFIG_MTD_UBI is not set
CONFIG_MTD=y
# CONFIG_MV643XX_ETH is not set
# CONFIG_MVSWITCH_PHY is not set
# CONFIG_MWAVE is not set
# CONFIG_MWL8K is not set
@@ -1513,12 +1515,12 @@ CONFIG_NFSD_TCP=y
# CONFIG_NFSD_V2_ACL is not set
# CONFIG_NFSD_V3_ACL is not set
CONFIG_NFSD_V3=y
CONFIG_NFSD_V4=y
# CONFIG_NFSD_V4 is not set
# CONFIG_NFS_FS is not set
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V3=y
# CONFIG_NFS_V4_1 is not set
CONFIG_NFS_V4=y
# CONFIG_NFS_V4 is not set
# CONFIG_NFTL is not set
# CONFIG_NILFS2_FS is not set
CONFIG_NL80211=y
@@ -1652,7 +1654,9 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI_ATMEL is not set
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
# CONFIG_PCIEAER_INJECT is not set
# CONFIG_PCIEASPM is not set
# CONFIG_PCIE_ECRC is not set
# CONFIG_PCI_HERMES is not set
# CONFIG_PCI_IOV is not set
# CONFIG_PCI_LEGACY is not set
@@ -1682,6 +1686,8 @@ CONFIG_PCI=y
# CONFIG_PCSPKR_PLATFORM is not set
# CONFIG_PD6729 is not set
# CONFIG_PDC_ADMA is not set
# CONFIG_PERF_COUNTERS is not set
# CONFIG_PERF_EVENTS is not set
# CONFIG_PHANTOM is not set
# CONFIG_PHONE is not set
# CONFIG_PHONET is not set
@@ -1701,6 +1707,7 @@ CONFIG_PLIST=y
CONFIG_PPC_4K_PAGES=y
CONFIG_PPC4xx_GPIO=y
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_DISABLE_WERROR is not set
# CONFIG_PPC_EMULATED_STATS is not set
# CONFIG_PPP_ASYNC is not set
# CONFIG_PPP_BSDCOMP is not set
@@ -1847,6 +1854,7 @@ CONFIG_RTC_LIB=y
# CONFIG_RTL8366_SMI is not set
# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
# CONFIG_RTL8366S_PHY is not set
# CONFIG_RTL8366RB_PHY is not set
CONFIG_RT_MUTEXES=y
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_RUNTIME_DEBUG is not set
@@ -2767,6 +2775,8 @@ CONFIG_XFRM=y
# CONFIG_XFS_QUOTA is not set
# CONFIG_XFS_RT is not set
# CONFIG_XFS_SECURITY is not set
# CONFIG_XILINX_EMACLITE is not set
# CONFIG_XILINX_LL_TEMAC is not set
# CONFIG_XIP_KERNEL is not set
# CONFIG_YAFFS_FS is not set
# CONFIG_YAM is not set

View File

@@ -62,16 +62,16 @@
#define AR8216_ATU_ACTIVE BIT(3)
#define AR8216_ATU_PORT_NUM BITS(8, 4)
#define AR8216_ATU_FULL_VIO BIT(12)
#define AR8216_ATU_ADDR4 BIT(16, 8)
#define AR8216_ATU_ADDR5 BIT(24, 8)
#define AR8216_ATU_ADDR4 BITS(16, 8)
#define AR8216_ATU_ADDR5 BITS(24, 8)
#define AR8216_REG_ATU_DATA 0x0054
#define AR8216_ATU_ADDR3 BIT(0, 8)
#define AR8216_ATU_ADDR2 BIT(8, 8)
#define AR8216_ATU_ADDR1 BIT(16, 8)
#define AR8216_ATU_ADDR0 BIT(24, 8)
#define AR8216_ATU_ADDR3 BITS(0, 8)
#define AR8216_ATU_ADDR2 BITS(8, 8)
#define AR8216_ATU_ADDR1 BITS(16, 8)
#define AR8216_ATU_ADDR0 BITS(24, 8)
#define AR8216_PORT_OFFSET(_i) (0x0100 * (i + 1))
#define AR8216_PORT_OFFSET(_i) (0x0100 * (_i + 1))
#define AR8216_REG_PORT_STATUS(_i) (AR8216_PORT_OFFSET(_i) + 0x0000)
#define AR8216_PORT_STATUS_SPEED BIT(0)
#define AR8216_PORT_STATUS_SPEED_ERR BIT(1)

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,21 @@
/*
* Platform data definition for the Realtek RTL8366S ethernet switch driver
*
* Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#ifndef _RTL8366RB_H
#define _RTL8366RB_H
#define RTL8366RB_DRIVER_NAME "rtl8366rb"
struct rtl8366rb_platform_data {
unsigned gpio_sda;
unsigned gpio_sck;
};
#endif /* _RTL8366RB_SMI_H */

View File

@@ -441,7 +441,7 @@
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
@@ -263,17 +276,97 @@ static struct block2mtd_dev *add_device(
@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
@@ -505,9 +505,10 @@
+ bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+ if (!bdev || !bdev->bd_disk)
+ err = -EINVAL;
+ else {
+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
+ else
+ err = rescan_partitions(bdev->bd_disk, bdev);
+ }
+#endif
+ if (bdev)
+ close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
+
@@ -542,7 +543,7 @@
if (!mtdname)
mtdname = devname;
@@ -297,6 +390,7 @@ static struct block2mtd_dev *add_device(
@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;

View File

@@ -0,0 +1,42 @@
commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a
Author: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Date: Fri Dec 4 11:06:32 2009 +0000
atm: [br2684] allow routed mode operation again
in routed mode, we don't have a hardware address so netdev_ops doesnt
need to validate our hardware address via .ndo_validate_addr
Reported-by: Manuel Fuentes <mfuentes@agenciaefe.com>
Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -544,6 +544,12 @@ static const struct net_device_ops br268
.ndo_validate_addr = eth_validate_addr,
};
+static const struct net_device_ops br2684_netdev_ops_routed = {
+ .ndo_start_xmit = br2684_start_xmit,
+ .ndo_set_mac_address = br2684_mac_addr,
+ .ndo_change_mtu = eth_change_mtu
+};
+
static void br2684_setup(struct net_device *netdev)
{
struct br2684_dev *brdev = BRPRIV(netdev);
@@ -559,11 +565,10 @@ static void br2684_setup(struct net_devi
static void br2684_setup_routed(struct net_device *netdev)
{
struct br2684_dev *brdev = BRPRIV(netdev);
- brdev->net_dev = netdev;
+ brdev->net_dev = netdev;
netdev->hard_header_len = 0;
-
- netdev->netdev_ops = &br2684_netdev_ops;
+ netdev->netdev_ops = &br2684_netdev_ops_routed;
netdev->addr_len = 0;
netdev->mtu = 1500;
netdev->type = ARPHRD_PPP;

View File

@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -135,4 +135,25 @@ config MDIO_GPIO
@@ -135,4 +135,29 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
@@ -17,9 +17,13 @@
+ tristate "Driver for the Realtek RTL8366S switch"
+ select SWCONFIG
+
+config RTL8366RB_PHY
+ tristate "Driver for the Realtek RTL8366RB switch"
+ select SWCONFIG
+
+config RTL8366S_PHY_DEBUG_FS
+ bool "RTL8366S switch driver DEBUG_FS support"
+ depends on RTL8366S_PHY
+ bool "RTL8366 switch driver DEBUG_FS support"
+ depends on RTL8366S_PHY || RTL8366RB_PHY
+ depends on DEBUG_FS
+ default n
+
@@ -28,12 +32,13 @@
endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -19,6 +19,8 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
@@ -19,6 +19,9 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
+obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o

View File

@@ -434,7 +434,7 @@
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
@@ -263,17 +276,97 @@ static struct block2mtd_dev *add_device(
@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
@@ -498,9 +498,10 @@
+ bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+ if (!bdev || !bdev->bd_disk)
+ err = -EINVAL;
+ else {
+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
+ else
+ err = rescan_partitions(bdev->bd_disk, bdev);
+ }
+#endif
+ if (bdev)
+ close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
+
@@ -535,7 +536,7 @@
if (!mtdname)
mtdname = devname;
@@ -297,6 +390,7 @@ static struct block2mtd_dev *add_device(
@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;

View File

@@ -0,0 +1,42 @@
commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a
Author: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Date: Fri Dec 4 11:06:32 2009 +0000
atm: [br2684] allow routed mode operation again
in routed mode, we don't have a hardware address so netdev_ops doesnt
need to validate our hardware address via .ndo_validate_addr
Reported-by: Manuel Fuentes <mfuentes@agenciaefe.com>
Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -536,6 +536,12 @@ static const struct net_device_ops br268
.ndo_validate_addr = eth_validate_addr,
};
+static const struct net_device_ops br2684_netdev_ops_routed = {
+ .ndo_start_xmit = br2684_start_xmit,
+ .ndo_set_mac_address = br2684_mac_addr,
+ .ndo_change_mtu = eth_change_mtu
+};
+
static void br2684_setup(struct net_device *netdev)
{
struct br2684_dev *brdev = BRPRIV(netdev);
@@ -551,11 +557,10 @@ static void br2684_setup(struct net_devi
static void br2684_setup_routed(struct net_device *netdev)
{
struct br2684_dev *brdev = BRPRIV(netdev);
- brdev->net_dev = netdev;
+ brdev->net_dev = netdev;
netdev->hard_header_len = 0;
-
- netdev->netdev_ops = &br2684_netdev_ops;
+ netdev->netdev_ops = &br2684_netdev_ops_routed;
netdev->addr_len = 0;
netdev->mtu = 1500;
netdev->type = ARPHRD_PPP;

View File

@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -135,4 +135,25 @@ config MDIO_GPIO
@@ -135,4 +135,29 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
@@ -17,9 +17,13 @@
+ tristate "Driver for the Realtek RTL8366S switch"
+ select SWCONFIG
+
+config RTL8366RB_PHY
+ tristate "Driver for the Realtek RTL8366RB switch"
+ select SWCONFIG
+
+config RTL8366S_PHY_DEBUG_FS
+ bool "RTL8366S switch driver DEBUG_FS support"
+ depends on RTL8366S_PHY
+ bool "RTL8366 switch driver DEBUG_FS support"
+ depends on RTL8366S_PHY || RTL8366RB_PHY
+ depends on DEBUG_FS
+ default n
+
@@ -28,12 +32,13 @@
endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -19,6 +19,8 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
@@ -19,6 +19,9 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
+obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o

View File

@@ -434,7 +434,7 @@
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
@@ -263,17 +276,97 @@ static struct block2mtd_dev *add_device(
@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
@@ -498,9 +498,10 @@
+ bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+ if (!bdev || !bdev->bd_disk)
+ err = -EINVAL;
+ else {
+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
+ else
+ err = rescan_partitions(bdev->bd_disk, bdev);
+ }
+#endif
+ if (bdev)
+ close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
+
@@ -535,7 +536,7 @@
if (!mtdname)
mtdname = devname;
@@ -297,6 +390,7 @@ static struct block2mtd_dev *add_device(
@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;

View File

@@ -1,6 +1,6 @@
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1170,7 +1170,7 @@
@@ -1170,7 +1170,7 @@ static unsigned long vma_dump_size(struc
if (FILTER(ELF_HEADERS) &&
vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
u32 __user *header = (u32 __user *) vma->vm_start;

View File

@@ -7,7 +7,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -31,6 +31,8 @@
@@ -31,6 +31,8 @@ struct sockaddr_ll
/* These ones are invisible by user level */
#define PACKET_LOOPBACK 5 /* MC/BRD frame looped back */
#define PACKET_FASTROUTE 6 /* Fastrouted frame */
@@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/* Packet socket options */
@@ -48,6 +50,7 @@
@@ -48,6 +50,7 @@ struct sockaddr_ll
#define PACKET_RESERVE 12
#define PACKET_TX_RING 13
#define PACKET_LOSS 14
@@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
{
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -204,6 +204,7 @@
@@ -204,6 +204,7 @@ struct packet_sock {
unsigned int tp_reserve;
unsigned int tp_loss:1;
#endif
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
};
struct packet_skb_cb {
@@ -342,6 +343,7 @@
@@ -342,6 +343,7 @@ static int packet_rcv_spkt(struct sk_buf
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* When we registered the protocol we saved the socket in the data
@@ -349,6 +351,7 @@
@@ -349,6 +351,7 @@ static int packet_rcv_spkt(struct sk_buf
*/
sk = pt->af_packet_priv;
@@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* Yank back the headers [hope the device set this
@@ -361,7 +364,7 @@
@@ -361,7 +364,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop.
*/
@@ -59,7 +59,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
goto out;
if (dev_net(dev) != sock_net(sk))
@@ -545,12 +548,12 @@
@@ -545,12 +548,12 @@ static int packet_rcv(struct sk_buff *sk
int skb_len = skb->len;
unsigned int snaplen, res;
@@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (dev_net(dev) != sock_net(sk))
goto drop;
@@ -667,12 +670,12 @@
@@ -667,12 +670,12 @@ static int tpacket_rcv(struct sk_buff *s
struct timeval tv;
struct timespec ts;
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (dev_net(dev) != sock_net(sk))
goto drop;
@@ -1390,6 +1393,7 @@
@@ -1390,6 +1393,7 @@ static int packet_create(struct net *net
spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
@@ -1737,6 +1741,16 @@
@@ -1737,6 +1741,16 @@ packet_setsockopt(struct socket *sock, i
ret = packet_mc_drop(sk, &mreq);
return ret;
}
@@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
#ifdef CONFIG_PACKET_MMAP
case PACKET_RX_RING:
@@ -1882,6 +1896,13 @@
@@ -1882,6 +1896,13 @@ static int packet_getsockopt(struct sock
data = &val;
break;

View File

@@ -0,0 +1,42 @@
commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a
Author: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Date: Fri Dec 4 11:06:32 2009 +0000
atm: [br2684] allow routed mode operation again
in routed mode, we don't have a hardware address so netdev_ops doesnt
need to validate our hardware address via .ndo_validate_addr
Reported-by: Manuel Fuentes <mfuentes@agenciaefe.com>
Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -554,6 +554,12 @@ static const struct net_device_ops br268
.ndo_validate_addr = eth_validate_addr,
};
+static const struct net_device_ops br2684_netdev_ops_routed = {
+ .ndo_start_xmit = br2684_start_xmit,
+ .ndo_set_mac_address = br2684_mac_addr,
+ .ndo_change_mtu = eth_change_mtu
+};
+
static void br2684_setup(struct net_device *netdev)
{
struct br2684_dev *brdev = BRPRIV(netdev);
@@ -569,11 +575,10 @@ static void br2684_setup(struct net_devi
static void br2684_setup_routed(struct net_device *netdev)
{
struct br2684_dev *brdev = BRPRIV(netdev);
- brdev->net_dev = netdev;
+ brdev->net_dev = netdev;
netdev->hard_header_len = 0;
-
- netdev->netdev_ops = &br2684_netdev_ops;
+ netdev->netdev_ops = &br2684_netdev_ops_routed;
netdev->addr_len = 0;
netdev->mtu = 1500;
netdev->type = ARPHRD_PPP;

View File

@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -141,4 +141,25 @@ config MDIO_GPIO
@@ -141,4 +141,29 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module
will be called mdio-gpio.
@@ -17,9 +17,13 @@
+ tristate "Driver for the Realtek RTL8366S switch"
+ select SWCONFIG
+
+config RTL8366RB_PHY
+ tristate "Driver for the Realtek RTL8366RB switch"
+ select SWCONFIG
+
+config RTL8366S_PHY_DEBUG_FS
+ bool "RTL8366S switch driver DEBUG_FS support"
+ depends on RTL8366S_PHY
+ bool "RTL8366 switch driver DEBUG_FS support"
+ depends on RTL8366S_PHY || RTL8366RB_PHY
+ depends on DEBUG_FS
+ default n
+
@@ -28,12 +32,13 @@
endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -20,6 +20,8 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
@@ -20,6 +20,9 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
+obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o

View File

@@ -1,6 +1,6 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2608,6 +2608,16 @@
@@ -2608,6 +2608,16 @@ int shmem_lock(struct file *file, int lo
/* common code */
@@ -17,7 +17,7 @@
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps
@@ -2687,9 +2697,6 @@
@@ -2687,9 +2697,6 @@ int shmem_zero_setup(struct vm_area_stru
if (IS_ERR(file))
return PTR_ERR(file);
@@ -30,7 +30,7 @@
}
--- a/fs/file.c
+++ b/fs/file.c
@@ -271,6 +271,7 @@
@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi
/* All good, so we try */
return expand_fdtable(files, nr);
}
@@ -40,7 +40,7 @@
{
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -507,6 +507,7 @@
@@ -507,6 +507,7 @@ struct files_struct *get_files_struct(st
return files;
}
@@ -48,7 +48,7 @@
void put_files_struct(struct files_struct *files)
{
@@ -526,6 +527,7 @@
@@ -526,6 +527,7 @@ void put_files_struct(struct files_struc
free_fdtable(fdt);
}
}
@@ -58,7 +58,7 @@
{
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -168,6 +168,7 @@
@@ -168,6 +168,7 @@ void __put_task_struct(struct task_struc
if (!profile_handoff_task(tsk))
free_task(tsk);
}
@@ -68,7 +68,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6093,6 +6093,7 @@
@@ -6093,6 +6093,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}
@@ -78,7 +78,7 @@
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1100,6 +1100,7 @@
@@ -1100,6 +1100,7 @@ unsigned long zap_page_range(struct vm_a
tlb_finish_mmu(tlb, address, end);
return end;
}
@@ -86,7 +86,7 @@
/**
* zap_vma_ptes - remove ptes mapping the vma
@@ -2486,6 +2487,7 @@
@@ -2486,6 +2487,7 @@ int vmtruncate_range(struct inode *inode
return 0;
}
@@ -96,7 +96,7 @@
* We enter with non-exclusive mmap_sem (to exclude vma changes,
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1172,6 +1172,7 @@
@@ -1172,6 +1172,7 @@ void unmap_kernel_range(unsigned long ad
vunmap_page_range(addr, end);
flush_tlb_kernel_range(addr, end);
}
@@ -104,7 +104,7 @@
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{
@@ -1287,6 +1288,7 @@
@@ -1287,6 +1288,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0));
}
@@ -114,7 +114,7 @@
void *caller)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -713,6 +713,7 @@
@@ -713,6 +713,7 @@ extern void show_free_areas(void);
int shmem_lock(struct file *file, int lock, struct user_struct *user);
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
@@ -124,7 +124,7 @@
#ifndef CONFIG_MMU
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1070,6 +1070,7 @@
@@ -1070,6 +1070,7 @@ struct sighand_struct *lock_task_sighand
return sighand;
}

View File

@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
@@ -836,10 +836,7 @@
@@ -836,10 +836,7 @@ static noinline int init_post(void)
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}