Changeset 17752


Ignore:
Timestamp:
2009-09-26T23:23:53+02:00 (7 years ago)
Author:
hauke
Message:

small fixes mostly for kernel 2.6.31

  • 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
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/block.mk

    r17359 r17752  
    418418  DEPENDS:=+kmod-scsi-core @TARGET_x86 
    419419  KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \ 
     420        CONFIG_SCSI_SAS_ATTRS \ 
    420421        CONFIG_SCSI_SAS_ATA=y \ 
    421422        CONFIG_SCSI_SAS_HOST_SMP=y \ 
    422423        CONFIG_SCSI_SAS_LIBSAS_DEBUG=y 
    423   FILES:=$(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX) 
    424   AUTOLOAD:=$(call AutoLoad,29,libsas) 
     424  FILES:= \ 
     425        $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.$(LINUX_KMOD_SUFFIX) \ 
     426        $(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX) 
     427  AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas) 
    425428endef 
    426429 
  • trunk/package/kernel/modules/netsupport.mk

    r17044 r17752  
    446446        $(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \ 
    447447        $(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX) 
     448  AUTOLOAD:=$(call AutoLoad,40,pppox pppoe) 
    448449endef 
    449450 
  • trunk/package/kernel/modules/other.mk

    r16935 r17752  
    785785    CONFIG_RFKILL_INPUT \ 
    786786    CONFIG_RFKILL_LEDS=y 
     787ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.31)),1) 
     788  FILES:= \ 
     789    $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) 
     790  AUTOLOAD:=$(call AutoLoad,20,rfkill) 
     791else 
    787792  FILES:= \ 
    788793    $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) \ 
    789794    $(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX) 
    790795  AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input) 
     796endif 
    791797endef 
    792798 
  • trunk/package/r8101/Makefile

    r16989 r17752  
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    16 PKG_SOURCE_URL:=ftp://WebUser:DAx7h9V@202.65.194.212/cn/nic/ 
     16PKG_SOURCE_URL:=ftp://WebUser:nQJ4P7b@202.65.194.212/cn/nic/ 
    1717PKG_MD5SUM:=eb0645af023926f3ab8d0d40f68748ef 
    1818 
     
    2222  SUBMENU:=Network Devices 
    2323  TITLE:=RealTek RTL-8101E PCIe Fast Ethernet Adapter kernel support 
    24   DEPENDS:=@TARGET_x86 
     24  DEPENDS:=@TARGET_x86 @!LINUX_2_6_31 
    2525  URL:=http://www.realtek.com.tw/ 
    2626  FILES:= $(PKG_BUILD_DIR)/src/r8101.$(LINUX_KMOD_SUFFIX) 
  • trunk/package/siit/Makefile

    r15242 r17752  
    1717  SUBMENU:=Network Devices 
    1818  TITLE:=Stateless IP ICMP Translation Algorithm 
     19  DEPENDS:=@!LINUX_2_6_31 
    1920  FILES:=$(PKG_BUILD_DIR)/siit.$(LINUX_KMOD_SUFFIX) 
    2021  AUTOLOAD:=$(call AutoLoad,50,siit) 
  • trunk/target/linux/generic-2.6/config-2.6.31

    r17726 r17752  
    153153# CONFIG_BLK_CPQ_DA is not set 
    154154# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 
     155# CONFIG_BLK_DEV_4DRIVES is not set 
    155156# CONFIG_BLK_DEV_AEC62XX is not set 
     157# CONFIG_BLK_DEV_ALI14XX is not set 
    156158# CONFIG_BLK_DEV_ALI15X3 is not set 
    157159# CONFIG_BLK_DEV_AMD74XX is not set 
     
    165167# CONFIG_BLK_DEV_CS5530 is not set 
    166168# CONFIG_BLK_DEV_CS5535 is not set 
     169# CONFIG_BLK_DEV_CS5536 is not set 
    167170# CONFIG_BLK_DEV_CY82C693 is not set 
    168171# CONFIG_BLK_DEV_DAC960 is not set 
    169172# CONFIG_BLK_DEV_DELKIN is not set 
     173# CONFIG_BLK_DEV_DTC2278 is not set 
    170174# CONFIG_BLK_DEV_FD is not set 
    171175# CONFIG_BLK_DEV_GENERIC is not set 
     
    175179# CONFIG_BLK_DEV_HPT34X is not set 
    176180# CONFIG_BLK_DEV_HPT366 is not set 
     181# CONFIG_BLK_DEV_HT6560B is not set 
    177182# CONFIG_BLK_DEV_IDEACPI is not set 
    178183# CONFIG_BLK_DEV_IDECD is not set 
     
    201206# CONFIG_BLK_DEV_PIIX is not set 
    202207# CONFIG_BLK_DEV_PLATFORM is not set 
     208# CONFIG_BLK_DEV_QD65XX is not set 
    203209# CONFIG_BLK_DEV_RAM is not set 
    204210# CONFIG_BLK_DEV_RZ1000 is not set 
     
    216222# CONFIG_BLK_DEV_TRM290 is not set 
    217223# CONFIG_BLK_DEV_UB is not set 
     224# CONFIG_BLK_DEV_UMC8672 is not set 
    218225# CONFIG_BLK_DEV_UMEM is not set 
    219226# CONFIG_BLK_DEV_VIA82CXXX is not set 
     
    402409CONFIG_CRYPTO=y 
    403410CONFIG_CRYPTO_ZLIB=y 
     411# CONFIG_CUSE is not set 
    404412# CONFIG_DAB is not set 
    405413# CONFIG_DAVICOM_PHY is not set 
     
    937945# CONFIG_KARMA_PARTITION is not set 
    938946# CONFIG_KEXEC is not set 
     947# CONFIG_KEYBOARD_LM8323 is not set 
    939948# CONFIG_KEYS is not set 
    940949# CONFIG_KMEMTRACE is not set 
     
    10321041# CONFIG_MKISS is not set 
    10331042# CONFIG_MMC_ARMMMCI is not set 
     1043# CONFIG_MMC_CB710 is not set 
    10341044# CONFIG_MMC is not set 
    10351045# CONFIG_MMC_SDRICOH_CS is not set 
    10361046# CONFIG_MMC_TEST is not set 
     1047# CONFIG_MMC_VIA_SDMMC is not set 
    10371048CONFIG_MMU=y 
    10381049# CONFIG_MODULE_FORCE_LOAD is not set 
     
    10461057# CONFIG_MOUSE_LOGIBM is not set 
    10471058# CONFIG_MOUSE_PC110PAD is not set 
     1059# CONFIG_MOUSE_SYNAPTICS_I2C is not set 
    10481060# CONFIG_MSDOS_FS is not set 
    10491061CONFIG_MSDOS_PARTITION=y 
     
    11961208# CONFIG_NETFILTER_XT_MATCH_MARK is not set 
    11971209# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set 
     1210# CONFIG_NETFILTER_XT_MATCH_OSF is not set 
    11981211# CONFIG_NETFILTER_XT_MATCH_OWNER is not set 
    11991212# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set 
     
    13241337CONFIG_NFS_V3=y 
    13251338CONFIG_NFS_V4=y 
     1339# CONFIG_NFS_V4_1 is not set 
    13261340# CONFIG_NFTL is not set 
    13271341# CONFIG_NILFS2_FS is not set 
     
    17811795# CONFIG_SENSORS_SMSC47M1 is not set 
    17821796# CONFIG_SENSORS_THMC50 is not set 
     1797# CONFIG_SENSORS_TMP401 is not set 
    17831798# CONFIG_SENSORS_TSL2550 is not set 
    17841799# CONFIG_SENSORS_VIA686A is not set 
     
    18241839# CONFIG_SLUB_DEBUG is not set 
    18251840# CONFIG_SLUB is not set 
     1841# CONFIG_SMARTJOYPLUS_FF is not set 
    18261842# CONFIG_SMB_FS is not set 
    18271843# CONFIG_SMB_NLS_DEFAULT is not set 
  • trunk/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch

    r17351 r17752  
    269269+       } 
    270270+       default: 
    271 +               info.dst   = (u32)(unsigned long)skb->dst; 
     271+               info.dst   = (u32)(unsigned long)skb_dst(skb); 
    272272+               info.src   = (u32)(unsigned long)skb->sk; 
    273273+               info.proto = skb->protocol; 
Note: See TracChangeset for help on using the changeset viewer.