qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 23:16:16 +02:00
Code

small fixes mostly for kernel 2.6.31

Browse Source 
- libsas needs symbols from scsi_transport_sas
 - autoload line in pppoe was missing
 - rfkill-input does not exist in kernel 2.6.31
 - password for download server of r8101 changed
 - r8101 and siit do not build with kernel 2.6.31
 - fix build of net sched esfq


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17752 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2009-09-26 21:23:53 +00:00
parent f3d7e220c3
commit 749981b832
7 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/kernel/modules/block.mk
View File

@ -417,11 +417,14 @@ define KernelPackage/libsas
TITLE:=SAS Domain Transport Attributes
DEPENDS:=+kmod-scsi-core @TARGET_x86
KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \
CONFIG_SCSI_SAS_ATTRS \
CONFIG_SCSI_SAS_ATA=y \
CONFIG_SCSI_SAS_HOST_SMP=y \
CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
FILES:=$(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,29,libsas)
FILES:= \
$(LINUX_DIR)/drivers/scsi/scsi_transport_sas.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas)
endef
define KernelPackage/libsas/description

1
package/kernel/modules/netsupport.mk
View File

@ -445,6 +445,7 @@ define KernelPackage/pppoe
FILES:= \
$(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,40,pppox pppoe)
endef
define KernelPackage/pppoe/description

6
package/kernel/modules/other.mk
View File

@ -784,10 +784,16 @@ define KernelPackage/rfkill
CONFIG_RFKILL \
CONFIG_RFKILL_INPUT \
CONFIG_RFKILL_LEDS=y
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.31)),1)
FILES:= \
$(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,20,rfkill)
else
FILES:= \
$(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input)
endif
endef
define KernelPackage/rfkill/description

4
package/r8101/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=1.012.00
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://WebUser:DAx7h9V@202.65.194.212/cn/nic/
PKG_SOURCE_URL:=ftp://WebUser:nQJ4P7b@202.65.194.212/cn/nic/
PKG_MD5SUM:=eb0645af023926f3ab8d0d40f68748ef
include $(INCLUDE_DIR)/package.mk
@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/r8101
SUBMENU:=Network Devices
TITLE:=RealTek RTL-8101E PCIe Fast Ethernet Adapter kernel support
DEPENDS:=@TARGET_x86
DEPENDS:=@TARGET_x86 @!LINUX_2_6_31
URL:=http://www.realtek.com.tw/
FILES:= $(PKG_BUILD_DIR)/src/r8101.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,r8101)

1
package/siit/Makefile
View File

@ -16,6 +16,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/siit
SUBMENU:=Network Devices
TITLE:=Stateless IP ICMP Translation Algorithm
DEPENDS:=@!LINUX_2_6_31
FILES:=$(PKG_BUILD_DIR)/siit.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,siit)
endef

16
target/linux/generic-2.6/config-2.6.31
View File

@ -152,7 +152,9 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_BLK_DEV_4DRIVES is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI14XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_ATIIXP is not set
@ -164,9 +166,11 @@ CONFIG_BINFMT_ELF=y
# 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_DTC2278 is not set
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_HD_IDE is not set
@ -174,6 +178,7 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BLK_DEV_HD_ONLY is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_HT6560B is not set
# CONFIG_BLK_DEV_IDEACPI is not set
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDECS is not set
@ -200,6 +205,7 @@ CONFIG_BLK_DEV_INITRD=y
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_PLATFORM is not set
# CONFIG_BLK_DEV_QD65XX is not set
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_RZ1000 is not set
# CONFIG_BLK_DEV_SC1200 is not set
@ -215,6 +221,7 @@ CONFIG_BLK_DEV_INITRD=y
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_UMC8672 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set
# CONFIG_BLK_DEV_XIP is not set
@ -401,6 +408,7 @@ CONFIG_CRYPTO_UNLZMA=y
# CONFIG_CRYPTO_XTS is not set
CONFIG_CRYPTO=y
CONFIG_CRYPTO_ZLIB=y
# CONFIG_CUSE is not set
# CONFIG_DAB is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DCB is not set
@ -936,6 +944,7 @@ CONFIG_JOLIET=y
# CONFIG_KALLSYMS is not set
# CONFIG_KARMA_PARTITION is not set
# CONFIG_KEXEC is not set
# CONFIG_KEYBOARD_LM8323 is not set
# CONFIG_KEYS is not set
# CONFIG_KMEMTRACE is not set
CONFIG_KMOD=y
@ -1031,9 +1040,11 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_MISDN is not set
# CONFIG_MKISS is not set
# CONFIG_MMC_ARMMMCI is not set
# CONFIG_MMC_CB710 is not set
# CONFIG_MMC is not set
# CONFIG_MMC_SDRICOH_CS is not set
# CONFIG_MMC_TEST is not set
# CONFIG_MMC_VIA_SDMMC is not set
CONFIG_MMU=y
# CONFIG_MODULE_FORCE_LOAD is not set
# CONFIG_MODULE_FORCE_UNLOAD is not set
@ -1045,6 +1056,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MOUSE_INPORT is not set
# CONFIG_MOUSE_LOGIBM is not set
# CONFIG_MOUSE_PC110PAD is not set
# CONFIG_MOUSE_SYNAPTICS_I2C is not set
# CONFIG_MSDOS_FS is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_MTD_ABSENT is not set
@ -1195,6 +1207,7 @@ CONFIG_NETFILTER_ADVANCED=y
# CONFIG_NETFILTER_XT_MATCH_MAC is not set
# CONFIG_NETFILTER_XT_MATCH_MARK is not set
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
# CONFIG_NETFILTER_XT_MATCH_OSF is not set
# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
@ -1323,6 +1336,7 @@ CONFIG_NFSD_V4=y
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V3=y
CONFIG_NFS_V4=y
# CONFIG_NFS_V4_1 is not set
# CONFIG_NFTL is not set
# CONFIG_NILFS2_FS is not set
CONFIG_NL80211=y
@ -1780,6 +1794,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47M1 is not set
# CONFIG_SENSORS_THMC50 is not set
# CONFIG_SENSORS_TMP401 is not set
# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_SENSORS_VIA686A is not set
# CONFIG_SENSORS_VT1211 is not set
@ -1823,6 +1838,7 @@ CONFIG_SLAB=y
# CONFIG_SLOB is not set
# CONFIG_SLUB_DEBUG is not set
# CONFIG_SLUB is not set
# CONFIG_SMARTJOYPLUS_FF is not set
# CONFIG_SMB_FS is not set
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_SMC911X is not set

2
target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
View File

@ -268,7 +268,7 @@
+ break;
+ }
+ default:
+ info.dst = (u32)(unsigned long)skb->dst;
+ info.dst = (u32)(unsigned long)skb_dst(skb);
+ info.src = (u32)(unsigned long)skb->sk;
+ info.proto = skb->protocol;
+ }