compat-wireless: activate usbnet for kernel > 2.6.28

Activate CONFIG_COMPAT_NET_USB_MODULES if the normal wireless system is build.
For kernel <= 2.6.28 usb_autopm_put_interface_async and usb_autopm_get_interface_async needs to be backported.
The new functions are used since commit 69ee472f2706371ca639de49b06df91615c07d8d in linux mainline.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/config.mk b/config.mk
index 726130f7159976de129c8322fc79bbaf96a9636c..e8cd6743d2fcb6ed3c769fb5025a2f87bc3418c6 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -30,6 +30,7 @@ else
 # 2.6.27. But -- we could just disable those drivers from kernels
 # older than 2.6.27
  CONFIG_COMPAT_NETWORK_MODULES=m
+ CONFIG_COMPAT_NET_USB_MODULES=m
 endif
 
 ifeq ($(CONFIG_BT),y)
@@ -338,9 +339,17 @@ CONFIG_ZD1211RW=m
 # is only wireless RNDIS chip known to date.
 # Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
 # it also requires new RNDIS_HOST and CDC_ETHER modules which we add
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_USB_NET_CDCETHER=m
+ifdef CONFIG_COMPAT_KERNEL_29
+CONFIG_USB_COMPAT_USBNET=n
+CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
+CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
+CONFIG_USB_NET_COMPAT_CDCETHER=n
+else
+CONFIG_USB_COMPAT_USBNET=m
+CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
+CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
+CONFIG_USB_NET_COMPAT_CDCETHER=m
+endif
 
 
 CONFIG_P54_USB=m

diff --git a/patches/99-change-makefiles.patch b/patches/99-change-makefiles.patch
index 35beaa87a9a721b9212a2734ac47575f08bbc9f5..e8b9d2d225e004b83dd426623538d16dabe9c23d 100644 (file)
--- a/patches/99-change-makefiles.patch
+++ b/patches/99-change-makefiles.patch
@@ -23,18 +23,18 @@ only the wireless stuff.
 -obj-$(CONFIG_USB_RTL8150)     += rtl8150.o
 -obj-$(CONFIG_USB_HSO)         += hso.o
 -obj-$(CONFIG_USB_NET_AX8817X) += asix.o
- obj-$(CONFIG_USB_NET_CDCETHER)        += cdc_ether.o
+ obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o
 -obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o
 -obj-$(CONFIG_USB_NET_DM9601)  += dm9601.o
 -obj-$(CONFIG_USB_NET_SMSC95XX)        += smsc95xx.o
 -obj-$(CONFIG_USB_NET_GL620A)  += gl620a.o
 -obj-$(CONFIG_USB_NET_NET1080) += net1080.o
 -obj-$(CONFIG_USB_NET_PLUSB)   += plusb.o
- obj-$(CONFIG_USB_NET_RNDIS_HOST)      += rndis_host.o
+ obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST)       += rndis_host.o
 -obj-$(CONFIG_USB_NET_CDC_SUBSET)      += cdc_subset.o
 -obj-$(CONFIG_USB_NET_ZAURUS)  += zaurus.o
 -obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o
- obj-$(CONFIG_USB_USBNET)      += usbnet.o
+ obj-$(CONFIG_USB_COMPAT_USBNET)       += usbnet.o
 -obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o
 -obj-$(CONFIG_USB_CDC_PHONET)  += cdc-phonet.o
  
@@ -68,7 +68,7 @@ only the wireless stuff.
 -obj-$(CONFIG_PCMCIA_RAYCS)    += ray_cs.o
 -obj-$(CONFIG_PCMCIA_WL3501)   += wl3501_cs.o
 -
- obj-$(CONFIG_USB_NET_RNDIS_WLAN)      += rndis_wlan.o
+ obj-$(CONFIG_USB_NET_COMPAT_RNDIS_WLAN)       += rndis_wlan.o
  
 -obj-$(CONFIG_USB_ZD1201)      += zd1201.o
 -obj-$(CONFIG_LIBERTAS)                += libertas/