compat-wireless: update to 3.5-1-snpc.

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index f215269fe82db41516d3d48bb579708a2e556433..cf49332c11af21a6c81998ed01d6b9ac66c027a3 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -26,7 +26,7 @@ include Config
 
 VERSUFIX=ipfire$(KCFG)
 
-VER        = 3.2.5-1
+VER        = 3.5-1-snpc
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -38,13 +38,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) asix-3.5.0a.tar.bz2
+objects = $(DL_FILE) asix-4.4.0.tar.xz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2
+asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz
 
-$(DL_FILE)_MD5 = 19670520d7f0289a5b4c6fb28520b2ac
-asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
+$(DL_FILE)_MD5 = 7099f748a9d2c05fffea7e5ea4f41a0b
+asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde
 
 install : $(TARGET)
 
@@ -87,11 +87,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
 
        # Build Updated asix usb-lan driver
-       cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2
+       cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix-4.4.0.tar.xz
 
        # Add libartas uAP driver
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.0-libertas_uap.patch
-       cd $(DIR_APP)&& echo CONFIG_LIBERTAS_UAP=m >> config.mk
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-libertas_uap.patch
+
+       # uAP will not build with xen-kernel (2.6)
+ifneq "$(KCFG)" "xen"
+       cd $(DIR_APP) && echo export CONFIG_LIBERTAS_UAP=m >> config.mk
+endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
        # fix atomic64 functions

diff --git a/src/patches/compat-wireless-3.0-libertas_uap.patch b/src/patches/compat-wireless-3.5-libertas_uap.patch
similarity index 97%
rename from src/patches/compat-wireless-3.0-libertas_uap.patch
rename to src/patches/compat-wireless-3.5-libertas_uap.patch
index 77bab835ddf9c26ef9aed893e923a2e696cef4e6..633bb67720694ad3e0cef778bcd4b55e9d088b67 100644 (file)
--- a/src/patches/compat-wireless-3.0-libertas_uap.patch
+++ b/src/patches/compat-wireless-3.5-libertas_uap.patch
@@ -1,6 +1,6 @@
-diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/Makefile compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/Makefile
---- compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/Makefile       1970-01-01 01:00:00.000000000 +0100
-+++ compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/Makefile   2011-10-21 11:13:58.697110085 +0200
+diff -Naur compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/Makefile compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/Makefile
+--- compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/Makefile      1970-01-01 01:00:00.000000000 +0100
++++ compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/Makefile  2012-07-31 14:23:04.000000000 +0200
 @@ -0,0 +1,6 @@
 +obj-$(CONFIG_LIBERTAS_UAP) += uap8xxx.o
 +
@@ -8,9 +8,9 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/Makefile
 +uap8xxx-$(CONFIG_PROC_FS) += uap_proc.o uap_debug.o
 +
 +EXTRA_CFLAGS += -DFPNUM='"52"' -DPXA3XX_DMA_ALIGN -DDEBUG_LEVEL1
-diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_debug.c compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_debug.c
---- compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_debug.c    1970-01-01 01:00:00.000000000 +0100
-+++ compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_debug.c        2011-10-21 11:13:58.707113466 +0200
+diff -Naur compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_debug.c compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_debug.c
+--- compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_debug.c   1970-01-01 01:00:00.000000000 +0100
++++ compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_debug.c       2012-07-31 14:23:04.000000000 +0200
 @@ -0,0 +1,261 @@
 +/** @file uap_debug.c
 +  * @brief This file contains functions for debug proc file.
@@ -273,9 +273,9 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_debug
 +}
 +
 +#endif
-diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_drv.h compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_drv.h
---- compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_drv.h      1970-01-01 01:00:00.000000000 +0100
-+++ compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_drv.h  2011-10-21 11:13:58.717113637 +0200
+diff -Naur compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_drv.h compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_drv.h
+--- compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_drv.h     1970-01-01 01:00:00.000000000 +0100
++++ compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_drv.h 2012-07-31 14:23:04.000000000 +0200
 @@ -0,0 +1,667 @@
 +/** @file uap_drv.h
 +  * @brief This file contains Linux OS related definitions and
@@ -944,9 +944,9 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_drv.h
 +int sbi_wakeup_firmware(uap_private * priv);
 +
 +#endif /* _UAP_DRV_H */
-diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_fw.h compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_fw.h
---- compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_fw.h       1970-01-01 01:00:00.000000000 +0100
-+++ compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_fw.h   2011-10-21 11:13:58.727115088 +0200
+diff -Naur compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_fw.h compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_fw.h
+--- compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_fw.h      1970-01-01 01:00:00.000000000 +0100
++++ compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_fw.h  2012-07-31 14:23:04.000000000 +0200
 @@ -0,0 +1,359 @@
 +/** @file uap_fw.h
 + *
@@ -1307,9 +1307,9 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_fw.h
 +    u8 MacAddr[ETH_ALEN];
 +} __ATTRIB_PACK__ AP_Event;
 +#endif /* _UAP_FW_H */
-diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_headers.h compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_headers.h
---- compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_headers.h  1970-01-01 01:00:00.000000000 +0100
-+++ compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_headers.h      2011-10-21 11:13:58.727115088 +0200
+diff -Naur compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_headers.h compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_headers.h
+--- compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_headers.h 1970-01-01 01:00:00.000000000 +0100
++++ compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_headers.h     2012-07-31 14:23:04.000000000 +0200
 @@ -0,0 +1,64 @@
 +/** @file uap_headers.h
 + *
@@ -1375,10 +1375,10 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_heade
 +#include "uap_sdio_mmc.h"
 +
 +#endif /* _UAP_HEADERS_H */
-diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_main.c compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_main.c
---- compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_main.c     1970-01-01 01:00:00.000000000 +0100
-+++ compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_main.c 2011-10-21 11:13:58.767112032 +0200
-@@ -0,0 +1,1830 @@
+diff -Naur compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_main.c compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_main.c
+--- compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_main.c    1970-01-01 01:00:00.000000000 +0100
++++ compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_main.c        2012-07-31 14:25:28.473230753 +0200
+@@ -0,0 +1,1815 @@
 +/** @file uap_main.c
 +  * @brief This file contains the major functions in uAP
 +  * driver. It includes init, exit etc..
@@ -2703,20 +2703,6 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_main.
 +}
 +
 +/**
-+ *  @brief This function sets multicast addresses to firmware
-+ *
-+ *  @param dev     A pointer to net_device structure
-+ *  @return        n/a
-+ */
-+static void
-+uap_set_multicast_list(struct net_device *dev)
-+{
-+    ENTER();
-+#warning uap_set_multicast_list not implemented. Expect problems with IPv6.
-+    LEAVE();
-+}
-+
-+/**
 + *  @brief This function handles the timeout of packet
 + *  transmission
 + *
@@ -2939,7 +2925,6 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_main.
 +    .ndo_set_mac_address = uap_set_mac_address,
 +    .ndo_tx_timeout = uap_tx_timeout,
 +    .ndo_get_stats = uap_get_stats,
-+    .ndo_set_multicast_list = uap_set_multicast_list,
 +};
 +#endif
 +
@@ -3209,10 +3194,10 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_main.
 +MODULE_AUTHOR("Marvell International Ltd.");
 +MODULE_VERSION(DRIVER_VERSION);
 +MODULE_LICENSE("GPL");
-diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_proc.c compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_proc.c
---- compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_proc.c     1970-01-01 01:00:00.000000000 +0100
-+++ compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_proc.c 2011-10-21 11:32:37.857111835 +0200
-@@ -0,0 +1,302 @@
+diff -Naur compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_proc.c compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_proc.c
+--- compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_proc.c    1970-01-01 01:00:00.000000000 +0100
++++ compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_proc.c        2012-07-31 14:23:04.000000000 +0200
+@@ -0,0 +1,296 @@
 +/** @file uap_proc.c
 +  * @brief This file contains functions for proc file.
 +  *
@@ -3308,15 +3293,9 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_proc.
 +        p += sprintf(p,
 +                     "MCAddr[%d]=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n",
 +                     i++,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
 +                     ha->addr[0], ha->addr[1],
 +                     ha->addr[2], ha->addr[3],
 +                     ha->addr[4], ha->addr[5]);
-+#else
-+                     ha->dmi_addr[0], ha->dmi_addr[1],
-+                     ha->dmi_addr[2], ha->dmi_addr[3],
-+                     ha->dmi_addr[4], ha->dmi_addr[5]);
-+#endif
 +    }
 +
 +    p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes);
@@ -3515,9 +3494,9 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_proc.
 +}
 +
 +#endif
-diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c
---- compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c 1970-01-01 01:00:00.000000000 +0100
-+++ compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c     2011-10-21 11:13:58.807113416 +0200
+diff -Naur compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c
+--- compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c        1970-01-01 01:00:00.000000000 +0100
++++ compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c    2012-07-31 14:23:04.000000000 +0200
 @@ -0,0 +1,1428 @@
 +/** @file uap_sdio_mmc.c
 + *  @brief This file contains SDIO IF (interface) module
@@ -4947,9 +4926,9 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_sdio_
 +    LEAVE();
 +    return ret;
 +}
-diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h
---- compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h 1970-01-01 01:00:00.000000000 +0100
-+++ compat-wireless-3.0-2/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h     2011-10-21 11:13:58.807113416 +0200
+diff -Naur compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h
+--- compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h        1970-01-01 01:00:00.000000000 +0100
++++ compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h    2012-07-31 14:23:04.000000000 +0200
 @@ -0,0 +1,136 @@
 +/** @file uap_sdio_mmc.h
 + *  @brief This file contains SDIO IF (interface) module
@@ -5087,9 +5066,9 @@ diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/libertas_uap/uap_sdio_
 +};
 +
 +#endif /* _UAP_SDIO_MMC_H */
-diff -Naur compat-wireless-3.0-2.org/drivers/net/wireless/Makefile compat-wireless-3.0-2/drivers/net/wireless/Makefile
---- compat-wireless-3.0-2.org/drivers/net/wireless/Makefile    2011-07-28 00:47:28.000000000 +0200
-+++ compat-wireless-3.0-2/drivers/net/wireless/Makefile        2011-10-21 11:13:58.697110085 +0200
+diff -Naur compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/Makefile compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/Makefile
+--- compat-wireless-3.5-rc5-1-snpc.org/drivers/net/wireless/Makefile   2012-07-05 03:48:01.000000000 +0200
++++ compat-wireless-3.5-rc5-1-snpc/drivers/net/wireless/Makefile       2012-07-31 14:20:01.343608619 +0200
 @@ -22,6 +22,8 @@
  
  obj-$(CONFIG_LIBERTAS_THINFIRM)       += libertas_tf/