On 2/25/2012 00:19, John O'Donnell wrote:
Lemme know if you run into any issues, I'll fix em right up. I havent run on a 3.2 kernel yet. Just 3.1
Hi John.I was going to reply that your patch doesn't work against 3.2.6, but I (stupidly!) was running it in dry-run mode, and some of the end patches (your additions?) fail because the additions of libertas_uap haven't been done (because of dry-run mode!) Stupid!
Let me copy my functional 3.2.6 tree, apply your patch, build, and see what happens.
Regards, -- Mersenne Law LLC · www.mersenne.com · +1-503-679-1671 - Small Business, Startup and Intellectual Property Law - 1500 SW First Ave. · Suite 1170 · Portland, Oregon 97201
Script started on Sat 25 Feb 2012 07:56:31 AM PST root@vex:/spare/linux-3.2.6# pwd /spare/linux-3.2.6 root@vex:/spare/linux-3.2.6# ls COPYING Module.symvers drivers lib security CREDITS README firmware mm sound Documentation REPORTING-BUGS fs modules.builtin tools Kbuild System.map include modules.order usr Kconfig arch init net virt MAINTAINERS block ipc samples vmlinux Makefile crypto kernel scripts vmlinux.o root@vex:/spare/linux-3.2.6# patch -p1 --dry-run < ../JJO-Marvell-Libertas-8688688-AP-FULLPATCH-up-to-3.1.2.patch patching file drivers/net/wireless/Kconfig Hunk #1 succeeded at 51 (offset 7 lines). patching file drivers/net/wireless/Makefile Hunk #1 succeeded at 37 (offset 1 line). patching file drivers/net/wireless/libertas_uap/Makefile patching file drivers/net/wireless/libertas_uap/uap_debug.c patching file drivers/net/wireless/libertas_uap/uap_drv.h patching file drivers/net/wireless/libertas_uap/uap_fw.h patching file drivers/net/wireless/libertas_uap/uap_headers.h patching file drivers/net/wireless/libertas_uap/uap_main.c patching file drivers/net/wireless/libertas_uap/uap_proc.c patching file drivers/net/wireless/libertas_uap/uap_sdio_mmc.c patching file drivers/net/wireless/libertas_uap/uap_sdio_mmc.h can't find file to patch at input line 5158 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -uNr linux-2.6.38rc8-marvell/drivers/net/wireless/libertas_uap/uap_main.c linux-2.6.38rc8-jjo/drivers/net/wireless/libertas_uap/uap_main.c |--- linux-2.6.38rc8-marvell/drivers/net/wireless/libertas_uap/uap_main.c 2011-03-19 15:46:38.000000000 -0400 |+++ linux-2.6.38rc8-jjo/drivers/net/wireless/libertas_uap/uap_main.c 2011-03-19 15:54:56.000000000 -0400 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 5186 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -uNr linux-2.6.38rc8-marvell/drivers/net/wireless/libertas_uap/uap_proc.c linux-2.6.38rc8-jjo/drivers/net/wireless/libertas_uap/uap_proc.c |--- linux-2.6.38rc8-marvell/drivers/net/wireless/libertas_uap/uap_proc.c 2011-03-19 15:46:38.000000000 -0400 |+++ linux-2.6.38rc8-jjo/drivers/net/wireless/libertas_uap/uap_proc.c 2011-03-19 15:55:03.000000000 -0400 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 5242 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -uNr linux-3.1.2-marvell/drivers/net/wireless/libertas_uap/uap_drv.h linux-3.2.1-jjo/drivers/net/wireless/libertas_uap/uap_drv.h |--- linux-3.1.2-marvell/drivers/net/wireless/libertas_uap/uap_drv.h 2011-12-03 03:45:34.780000306 -0500 |+++ linux-3.1.2-jjo/drivers/net/wireless/libertas_uap/uap_drv.h 2011-12-03 03:53:19.950000306 -0500 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored root@vex:/spare/linux-3.2.6# ls drivers/net/wireless Kconfig atmel.h iwmc3200wifi mwl8k.mod.o rtlwifi Makefile atmel_cs.c libertas mwl8k.o wl1251 adm8211.c atmel_pci.c libertas_tf orinoco wl12xx adm8211.h b43 mac80211_hwsim.c p54 wl3501.h airo.c b43legacy mac80211_hwsim.h prism54 wl3501_cs.c airo.h brcm80211 modules.builtin ray_cs.c zd1201.c airo_cs.c built-in.o modules.order ray_cs.h zd1201.h at76c50x-usb.c hostap mwifiex rayctl.h zd1211rw at76c50x-usb.h ipw2x00 mwl8k.c rndis_wlan.c ath iwlegacy mwl8k.ko rt2x00 atmel.c iwlwifi mwl8k.mod.c rtl818x root@vex:/spare/linux-3.2.6# ls drivers/net/wireless/libertas Kconfig debugfs.c if_spi.c libertas_sdio.o rx.c LICENSE debugfs.h if_spi.h libertas_spi.ko rx.o Makefile debugfs.o if_spi.o libertas_spi.mod.c tx.c README decl.h if_usb.c libertas_spi.mod.o tx.o built-in.o defs.h if_usb.h libertas_spi.o types.h cfg.c dev.h if_usb.o main.c usb8xxx.ko cfg.h ethtool.c libertas.ko main.o usb8xxx.mod.c cfg.o ethtool.o libertas.mod.c mesh.c usb8xxx.mod.o cmd.c host.h libertas.mod.o mesh.h usb8xxx.o cmd.h if_cs.c libertas.o mesh.o cmd.o if_sdio.c libertas_sdio.ko modules.builtin cmdresp.c if_sdio.h libertas_sdio.mod.c modules.order cmdresp.o if_sdio.o libertas_sdio.mod.o radiotap.h root@vex:/spare/linux-3.2.6# ls drivers/net/wireless/libertas_tf Makefile if_usb.h libertas_tf.o main.o built-in.o if_usb.o libertas_tf_usb.ko modules.builtin cmd.c libertas_tf.h libertas_tf_usb.mod.c modules.order cmd.o libertas_tf.ko libertas_tf_usb.mod.o deb_defs.h libertas_tf.mod.c libertas_tf_usb.o if_usb.c libertas_tf.mod.o main.c root@vex:/spare/linux-3.2.6# exit Script done on Sat 25 Feb 2012 07:57:29 AM PST
smime.p7s
Description: S/MIME Cryptographic Signature
_______________________________________________ ARMedslack mailing list [email protected] http://lists.armedslack.org/mailman/listinfo/armedslack
