* [PATCH 2/3] compat-wireless-stable-2.6.33.y: Activate libertas
2010-02-01 22:25 [PATCH 1/3] compat-wireless-stable-2.6.33.y: Activate ssb y
@ 2010-02-01 22:25 ` y
2010-02-01 22:25 ` [PATCH 3/3] compat-wireless-stable-2.6.33.y: activate usbnet for kernel > 2.6.28 y
2010-02-14 21:31 ` [PATCH 1/3] compat-wireless-stable-2.6.33.y: Activate ssb Hauke Mehrtens
2 siblings, 0 replies; 6+ messages in thread
From: y @ 2010-02-01 22:25 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens
From: Hauke Mehrtens <hauke@hauke-m.de>
This is a backport of compat-wireless commit 67228098e77852a0cf50c7c6c413fa601bd6f5b1 and 79cfcf76ef0f275146f0cd0a9ad55134310fdfb3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/19-kfifo.patch | 47 +++++++++++++++++++++++++++++++++++++
patches/99-change-makefiles.patch | 9 ++----
2 files changed, 50 insertions(+), 6 deletions(-)
create mode 100644 patches/19-kfifo.patch
diff --git a/patches/19-kfifo.patch b/patches/19-kfifo.patch
new file mode 100644
index 0000000..341ef09
--- /dev/null
+++ b/patches/19-kfifo.patch
@@ -0,0 +1,47 @@
+These parts of the new generic kernel FIFO implementation (kfifo) can
+not be backported easily with defines in the compat module.
+
+--- a/drivers/net/wireless/libertas/dev.h
++++ b/drivers/net/wireless/libertas/dev.h
+@@ -120,7 +120,11 @@ struct lbs_private {
+ u32 resp_len[2];
+
+ /* Events sent from hardware to driver */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+ struct kfifo event_fifo;
++#else
++ struct kfifo *event_fifo;
++#endif
+
+ /** thread to service interrupts */
+ struct task_struct *main_thread;
+--- a/drivers/net/wireless/libertas/main.c
++++ b/drivers/net/wireless/libertas/main.c
+@@ -886,8 +886,14 @@ static int lbs_init_adapter(struct lbs_p
+ priv->resp_len[0] = priv->resp_len[1] = 0;
+
+ /* Create the event FIFO */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+ ret = kfifo_alloc(&priv->event_fifo, sizeof(u32) * 16, GFP_KERNEL);
+ if (ret) {
++#else
++ priv->event_fifo = kfifo_alloc(sizeof(u32) * 16, GFP_KERNEL, NULL);
++ if (IS_ERR(priv->event_fifo)) {
++ ret = -ENOMEM;
++#endif
+ lbs_pr_err("Out of memory allocating event FIFO buffer\n");
+ goto out;
+ }
+@@ -903,7 +909,12 @@ static void lbs_free_adapter(struct lbs_
+ lbs_deb_enter(LBS_DEB_MAIN);
+
+ lbs_free_cmd_buffer(priv);
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+ kfifo_free(&priv->event_fifo);
++#else
++ if (priv->event_fifo)
++ kfifo_free(priv->event_fifo);
++#endif
+ del_timer(&priv->command_timer);
+ del_timer(&priv->auto_deepsleep_timer);
+ kfree(priv->networks);
diff --git a/patches/99-change-makefiles.patch b/patches/99-change-makefiles.patch
index ea19a86..2de20be 100644
--- a/patches/99-change-makefiles.patch
+++ b/patches/99-change-makefiles.patch
@@ -40,7 +40,7 @@ only the wireless stuff.
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
-@@ -5,36 +5,16 @@
+@@ -5,33 +5,16 @@
obj-$(CONFIG_IPW2100) += ipw2x00/
obj-$(CONFIG_IPW2200) += ipw2x00/
@@ -71,12 +71,9 @@ only the wireless stuff.
obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o
-obj-$(CONFIG_USB_ZD1201) += zd1201.o
--obj-$(CONFIG_LIBERTAS) += libertas/
--
--obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/
-
- obj-$(CONFIG_ADM8211) += adm8211.o
+ obj-$(CONFIG_LIBERTAS) += libertas/
+ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -4,11 +4,6 @@ obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib8
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] compat-wireless-stable-2.6.33.y: activate usbnet for kernel > 2.6.28
2010-02-01 22:25 [PATCH 1/3] compat-wireless-stable-2.6.33.y: Activate ssb y
2010-02-01 22:25 ` [PATCH 2/3] compat-wireless-stable-2.6.33.y: Activate libertas y
@ 2010-02-01 22:25 ` y
2010-02-14 21:31 ` [PATCH 1/3] compat-wireless-stable-2.6.33.y: Activate ssb Hauke Mehrtens
2 siblings, 0 replies; 6+ messages in thread
From: y @ 2010-02-01 22:25 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens
From: Hauke Mehrtens <hauke@hauke-m.de>
This is a backport of compat-wireless commit 377a5538e1edf8bdf432cc95abe806754de9cda3 and 10214accd45f4edab915eeb71e077685fed899c6
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 15 +++++++--
patches/20-rename-usb-net-symbols.patch | 52 +++++++++++++++++++++++++++++++
patches/99-change-makefiles.patch | 8 ++--
3 files changed, 68 insertions(+), 7 deletions(-)
create mode 100644 patches/20-rename-usb-net-symbols.patch
diff --git a/config.mk b/config.mk
index 4fece93..95b6773 100644
--- a/config.mk
+++ b/config.mk
@@ -87,6 +87,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
# The Bluetooth compatibility only builds on kernels >= 2.6.27 for now
@@ -352,9 +353,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/20-rename-usb-net-symbols.patch b/patches/20-rename-usb-net-symbols.patch
new file mode 100644
index 0000000..5ac90e2
--- /dev/null
+++ b/patches/20-rename-usb-net-symbols.patch
@@ -0,0 +1,52 @@
+Rename config names for usbnet to deactivate them also if activated in
+the main kernel configuration. This is needed because
+usb_autopm_put_interface_async and usb_autopm_get_interface_async are
+not backported to kernel 2.6.28 and earlier.
+Remove this patch if these symbols are backported.
+
+--- a/drivers/net/usb/Makefile
++++ b/drivers/net/usb/Makefile
+@@ -8,18 +8,18 @@ obj-$(CONFIG_USB_PEGASUS) += pegasus.o
+ 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
+
+--- a/drivers/net/usb/cdc_ether.c
++++ b/drivers/net/usb/cdc_ether.c
+@@ -33,7 +33,7 @@
+ #include <linux/usb/usbnet.h>
+
+
+-#if defined(CONFIG_USB_NET_RNDIS_HOST) || defined(CONFIG_USB_NET_RNDIS_HOST_MODULE)
++#if defined(CONFIG_USB_NET_COMPAT_RNDIS_HOST) || defined(CONFIG_USB_NET_COMPAT_RNDIS_HOST_MODULE)
+
+ static int is_rndis(struct usb_interface_descriptor *desc)
+ {
+--- a/drivers/net/wireless/Makefile
++++ b/drivers/net/wireless/Makefile
+@@ -29,7 +29,7 @@ obj-$(CONFIG_RTL8187) += rtl818x/
+ 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/
diff --git a/patches/99-change-makefiles.patch b/patches/99-change-makefiles.patch
index 2de20be..2fe68e5 100644
--- 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/
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread