Changeset 23993


Ignore:
Timestamp:
2010-11-14T21:51:30+01:00 (7 years ago)
Author:
hauke
Message:

kernel: fix l2tp kernel packages

l2tp-ip and l2tp-eth should depend on l2tp_netlink
fix pppol2tp for kernel >= 2.6.35

Location:
trunk
Files:
4 edited

Legend:

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

    r23986 r23993  
    474474  KCONFIG:=CONFIG_PPPOL2TP 
    475475  ifneq ($(CONFIG_LINUX_2_6_35)$(CONFIG_LINUX_2_6_36)$(CONFIG_LINUX_2_6_37),) 
    476     FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.mod.o 
     476    FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko 
     477    AUTOLOAD:=$(call AutoLoad,40,l2tp_ppp) 
    477478  else 
    478479    FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.ko 
     480    AUTOLOAD:=$(call AutoLoad,40,pppol2tp) 
    479481  endif 
    480   AUTOLOAD:=$(call AutoLoad,40,pppol2tp) 
    481482endef 
    482483 
     
    631632  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
    632633  DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37 
    633   TITLE:=L2TPv3 Support 
    634   KCONFIG:=CONFIG_L2TP CONFIG_L2TP_DEBUGFS=n 
    635   FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.$(LINUX_KMOD_SUFFIX) 
    636   AUTOLOAD:=$(call AutoLoad,32,l2tp_core) 
     634  TITLE:=Layer Two Tunneling Protocol (L2TP) 
     635  KCONFIG:=CONFIG_L2TP \ 
     636        CONFIG_L2TP_V3=y \ 
     637        CONFIG_L2TP_DEBUGFS=n 
     638  FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.$(LINUX_KMOD_SUFFIX) \ 
     639        $(LINUX_DIR)/net/l2tp/l2tp_netlink.$(LINUX_KMOD_SUFFIX) 
     640  AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_netlink) 
    637641endef 
    638642 
     
    643647$(eval $(call KernelPackage,l2tp)) 
    644648 
     649 
    645650define KernelPackage/l2tp-eth 
    646651  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
    647652  TITLE:=L2TP ethernet pseudowire support for L2TPv3 
    648653  DEPENDS:=+kmod-l2tp 
    649   KCONFIG:= CONFIG_L2TP_V3=y \ 
    650   CONFIG_L2TP_ETH 
    651   FILES:= \ 
    652           $(LINUX_DIR)/net/l2tp/l2tp_netlink.$(LINUX_KMOD_SUFFIX) \ 
    653           $(LINUX_DIR)/net/l2tp/l2tp_eth.$(LINUX_KMOD_SUFFIX)  
    654   AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_netlink l2tp_eth) 
     654  KCONFIG:=CONFIG_L2TP_ETH 
     655  FILES:=$(LINUX_DIR)/net/l2tp/l2tp_eth.$(LINUX_KMOD_SUFFIX)  
     656  AUTOLOAD:=$(call AutoLoad,33,l2tp_eth) 
    655657endef 
    656658 
    657659define KernelPackage/l2tp-eth/description 
    658  Kernel modules for L2TP V3 pseudowire support 
     660 Kernel modules for L2TP ethernet pseudowire support for L2TPv3 
    659661endef 
    660662 
     
    663665define KernelPackage/l2tp-ip 
    664666  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
    665   TITLE:=Support for L2TP-over-IP socket family 
     667  TITLE:=L2TP IP encapsulation for L2TPv3 
    666668  DEPENDS:=+kmod-l2tp 
    667   KCONFIG:= CONFIG_L2TP_V3=y \ 
    668   CONFIG_L2TP_IP 
     669  KCONFIG:=CONFIG_L2TP_IP 
    669670  FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.$(LINUX_KMOD_SUFFIX) 
    670   AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_ip) 
     671  AUTOLOAD:=$(call AutoLoad,33,l2tp_ip) 
    671672endef 
    672673 
    673674define KernelPackage/l2tp-ip/description 
    674  Kernel modules for L2TP-over-IP socket family 
     675 Kernel modules for L2TP IP encapsulation for L2TPv3 
    675676endef 
    676677 
  • trunk/target/linux/generic/config-2.6.35

    r23622 r23993  
    12481248# CONFIG_KSZ884X_PCI is not set 
    12491249# CONFIG_L2TP is not set 
     1250# CONFIG_L2TP_ETH is not set 
     1251# CONFIG_L2TP_IP is not set 
     1252# CONFIG_L2TP_V3 is not set 
    12501253# CONFIG_LANMEDIA is not set 
    12511254# CONFIG_LAPB is not set 
  • trunk/target/linux/generic/config-2.6.36

    r23934 r23993  
    11361136# CONFIG_KSZ884X_PCI is not set 
    11371137# CONFIG_L2TP is not set 
     1138# CONFIG_L2TP_ETH is not set 
     1139# CONFIG_L2TP_IP is not set 
     1140# CONFIG_L2TP_V3 is not set 
    11381141# CONFIG_LANMEDIA is not set 
    11391142# CONFIG_LAPB is not set 
  • trunk/target/linux/generic/config-2.6.37

    r23963 r23993  
    11241124# CONFIG_KSZ884X_PCI is not set 
    11251125# CONFIG_L2TP is not set 
     1126# CONFIG_L2TP_ETH is not set 
     1127# CONFIG_L2TP_IP is not set 
     1128# CONFIG_L2TP_V3 is not set 
    11261129# CONFIG_LANMEDIA is not set 
    11271130# CONFIG_LAPB is not set 
Note: See TracChangeset for help on using the changeset viewer.