diff --git a/include/linux/compat-2.6.33.h b/include/linux/compat-2.6.33.h index c2dbc1b..468a074 100644 --- a/include/linux/compat-2.6.33.h +++ b/include/linux/compat-2.6.33.h @@ -52,19 +52,6 @@ static inline void compat_release_firmware(const struct firmware *fw) #define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */ /* source: include/linux/if.h */ -/* this will never happen on older kernels */ -#define NETDEV_POST_INIT 0xffff - -static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, - unsigned int length) -{ - struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN); - - if (NET_IP_ALIGN && skb) - skb_reserve(skb, NET_IP_ALIGN); - return skb; -} - #if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE) #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) Problem 02: Multiple errors in function ‘ieee80211_led_init’: CC [M] /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.o /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c: In function ‘ieee80211_led_init’: /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c:59: error: invalid application of ‘sizeof’ to incomplete type ‘struct led_trigger’ /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c:63: error: dereferencing pointer to incomplete type /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c:64: error: implicit declaration of function ‘led_trigger_register’ /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c:70: error: invalid application of ‘sizeof’ to incomplete type ‘struct led_trigger’ /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c:74: error: dereferencing pointer to incomplete type /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c:81: error: invalid application of ‘sizeof’ to incomplete type ‘struct led_trigger’ /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c:85: error: dereferencing pointer to incomplete type /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c:92: error: invalid application of ‘sizeof’ to incomplete type ‘struct led_trigger’ /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c:96: error: dereferencing pointer to incomplete type /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c: In function ‘ieee80211_led_exit’: /tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.c:107: error: implicit declaration of function ‘led_trigger_unregister’ make[3]: *** [/tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211/led.o] Error 1 make[2]: *** [/tool/patches/compat-wireless-2.6.37-rc6-3-patchwork/net/mac80211] Error 2 make[1]: *** [_module_/tool/patches/compat-wireless-2.6.37-rc6-3-patchwork] Error 2 make[1]: Leaving directory `/tool/patches/android-rowboat-2.6.32-kernel-patchwork' make: *** [modules] Error 2 Solution: In the kernel config, CONFIG_LEDS_TRIGGERS is probably unset and net/mac80211/led.c should not be build at all. In the kernel CONFIG_MAC80211_LEDS will select CONFIG_LEDS_TRIGGERS, but in compat-wireless this should just be disabled. Apply the following patch to fix the problem. From 47d9c7d253a7b2a78af69f0d8177ee55df74ea0e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 22 Dec 2010 19:10:34 +0100 Subject: [PATCH] compat-wireless: build led support conditionally Do not build compat-wireless with LED support when the kernel does not contain a led subsystem. This fixes some compile problems when CONFIG_LEDS_TRIGGERS is not set. Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- config.mk | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/config.mk b/config.mk index 964c646..3a38d34 100644 --- a/config.mk +++ b/config.mk @@ -133,7 +133,9 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_MINSTREL_HT=y -CONFIG_MAC80211_LEDS=y +ifdef CONFIG_LEDS_TRIGGERS + CONFIG_MAC80211_LEDS=y +endif #CONFIG_LEDS_TRIGGERS # enable mesh networking too CONFIG_MAC80211_MESH=y @@ -243,7 +245,9 @@ CONFIG_B43_PCI_AUTOSELECT=y ifdef CONFIG_PCMCIA CONFIG_B43_PCMCIA=y endif #CONFIG_PCMCIA -CONFIG_B43_LEDS=y +ifdef CONFIG_MAC80211_LEDS + CONFIG_B43_LEDS=y +endif #CONFIG_MAC80211_LEDS CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y # CONFIG_B43_FORCE_PIO=y @@ -252,7 +256,9 @@ CONFIG_B43_PHY_N=y CONFIG_B43LEGACY=m CONFIG_B43LEGACY_HWRNG=y CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y +ifdef CONFIG_MAC80211_LEDS + CONFIG_B43LEGACY_LEDS=y +endif #CONFIG_MAC80211_LEDS # CONFIG_B43LEGACY_DEBUG=y CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y @@ -408,18 +414,24 @@ endif #CONFIG_COMPAT_KERNEL_29 CONFIG_P54_USB=m CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y +ifdef CONFIG_MAC80211_LEDS + CONFIG_RTL8187_LEDS=y +endif #CONFIG_MAC80211_LEDS CONFIG_AT76C50X_USB=m ifndef CONFIG_COMPAT_KERNEL_28 CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y +ifdef CONFIG_MAC80211_LEDS + CONFIG_AR9170_LEDS=y +endif #CONFIG_MAC80211_LEDS endif #CONFIG_COMPAT_KERNEL_28 ifndef CONFIG_COMPAT_KERNEL_29 CONFIG_CARL9170=m -CONFIG_CARL9170_LEDS=y +ifdef CONFIG_MAC80211_LEDS + CONFIG_CARL9170_LEDS=y +endif #CONFIG_MAC80211_LEDS # CONFIG_CARL9170_DEBUGFS=y # CONFIG_CARL9170_WPC=y endif #CONFIG_COMPAT_KERNEL_29 @@ -559,7 +571,9 @@ CONFIG_RT2X00_LIB_CRYPTO=y ifdef CONFIG_COMPAT_KERNEL_25 CONFIG_RT2X00_LIB_LEDS=n else #CONFIG_COMPAT_KERNEL_25 -CONFIG_RT2X00_LIB_LEDS=y +ifdef CONFIG_LEDS_CLASS + CONFIG_RT2X00_LIB_LEDS=y +endif #CONFIG_LEDS_CLASS endif #CONFIG_COMPAT_KERNEL_25 # CONFIG_RT2X00_DEBUG=y # CONFIG_RT2X00_LIB_DEBUGFS @@ -567,7 +581,9 @@ endif # p54 CONFIG_P54_COMMON=m -CONFIG_P54_LEDS=y +ifdef CONFIG_MAC80211_LEDS + CONFIG_P54_LEDS=y +endif #CONFIG_MAC80211_LEDS # Atheros CONFIG_ATH_COMMON=m @@ -594,7 +610,9 @@ endif #CONFIG_COMPAT_KERNEL_27 # In more recent kernel versions use the in kernel rfkill module. ifdef CONFIG_COMPAT_KERNEL_31 CONFIG_RFKILL_BACKPORT=m -CONFIG_RFKILL_BACKPORT_LEDS=y +ifdef CONFIG_LEDS_TRIGGERS + CONFIG_RFKILL_BACKPORT_LEDS=y +endif #CONFIG_LEDS_TRIGGERS CONFIG_RFKILL_BACKPORT_INPUT=y endif #CONFIG_COMPAT_KERNEL_31