From 77e8d2b0de26bec11380d0116848dd01d2294dd0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 27 Dec 2010 23:44:55 +0100 Subject: [PATCH] bcm_sta: update to bcm_sta-5.100.82.38 Signed-off-by: Stephan Raue --- packages/linux-drivers/bcm_sta/meta | 2 +- ...a-5.100.82.38-010_remove_sysioc_sem.patch} | 0 .../bcm_sta-5.100.82.38-011_init_MUTEX.patch | 24 +++++++++++++++++ ...sta-5.100.82.38-02_rename_device-0.1.patch | 26 +++++++++++++++++++ ..._sta-5.60.246.6-02_rename_device-0.1.patch | 24 ----------------- 5 files changed, 51 insertions(+), 25 deletions(-) rename packages/linux-drivers/bcm_sta/patches/{bcm_sta-5.60.246.6-010_remove_sysioc_sem.patch => bcm_sta-5.100.82.38-010_remove_sysioc_sem.patch} (100%) create mode 100644 packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.38-011_init_MUTEX.patch create mode 100644 packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.38-02_rename_device-0.1.patch delete mode 100644 packages/linux-drivers/bcm_sta/patches/bcm_sta-5.60.246.6-02_rename_device-0.1.patch diff --git a/packages/linux-drivers/bcm_sta/meta b/packages/linux-drivers/bcm_sta/meta index 580d2d17ee..71b181d56f 100644 --- a/packages/linux-drivers/bcm_sta/meta +++ b/packages/linux-drivers/bcm_sta/meta @@ -1,5 +1,5 @@ PKG_NAME="bcm_sta" -PKG_VERSION="5.60.246.6" +PKG_VERSION="5.100.82.38" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" diff --git a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.60.246.6-010_remove_sysioc_sem.patch b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.38-010_remove_sysioc_sem.patch similarity index 100% rename from packages/linux-drivers/bcm_sta/patches/bcm_sta-5.60.246.6-010_remove_sysioc_sem.patch rename to packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.38-010_remove_sysioc_sem.patch diff --git a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.38-011_init_MUTEX.patch b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.38-011_init_MUTEX.patch new file mode 100644 index 0000000000..83a6b3d393 --- /dev/null +++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.38-011_init_MUTEX.patch @@ -0,0 +1,24 @@ +diff -Naur bcm_sta-5.100.82.38/x86-32/src/wl/sys/wl_linux.c bcm_sta-5.100.82.38.patch/x86-32/src/wl/sys/wl_linux.c +--- bcm_sta-5.100.82.38/x86-32/src/wl/sys/wl_linux.c 2010-12-15 02:58:07.000000000 +0100 ++++ bcm_sta-5.100.82.38.patch/x86-32/src/wl/sys/wl_linux.c 2010-12-27 23:42:21.319475865 +0100 +@@ -482,7 +482,7 @@ + #ifdef WL_ALL_PASSIVE + spin_lock_init(&wl->txq_lock); + #endif +- init_MUTEX(&wl->sem); ++ sema_init(&wl->sem, 1); + } + + if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode, +diff -Naur bcm_sta-5.100.82.38/x86-64/src/wl/sys/wl_linux.c bcm_sta-5.100.82.38.patch/x86-64/src/wl/sys/wl_linux.c +--- bcm_sta-5.100.82.38/x86-64/src/wl/sys/wl_linux.c 2010-12-15 03:01:09.000000000 +0100 ++++ bcm_sta-5.100.82.38.patch/x86-64/src/wl/sys/wl_linux.c 2010-12-27 23:42:38.462649098 +0100 +@@ -482,7 +482,7 @@ + #ifdef WL_ALL_PASSIVE + spin_lock_init(&wl->txq_lock); + #endif +- init_MUTEX(&wl->sem); ++ sema_init(&wl->sem, 1); + } + + if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode, diff --git a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.38-02_rename_device-0.1.patch b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.38-02_rename_device-0.1.patch new file mode 100644 index 0000000000..36d3d27288 --- /dev/null +++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.38-02_rename_device-0.1.patch @@ -0,0 +1,26 @@ +diff -Naur bcm_sta-5.100.82.38/x86-32/src/wl/sys/wl_linux.c bcm_sta-5.100.82.38.patch/x86-32/src/wl/sys/wl_linux.c +--- bcm_sta-5.100.82.38/x86-32/src/wl/sys/wl_linux.c 2010-12-15 02:58:07.000000000 +0100 ++++ bcm_sta-5.100.82.38.patch/x86-32/src/wl/sys/wl_linux.c 2010-12-27 22:14:38.679428984 +0100 +@@ -251,7 +251,7 @@ + #define quote_str(s) to_str(s) + + #ifndef BRCM_WLAN_IFNAME +-#define BRCM_WLAN_IFNAME eth%d ++#define BRCM_WLAN_IFNAME wlan%d + #endif + + static char name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); +diff -Naur bcm_sta-5.100.82.38/x86-32/src/wl/sys/wl_linux.c.orig bcm_sta-5.100.82.38.patch/x86-32/src/wl/sys/wl_linux.c.orig +diff -Naur bcm_sta-5.100.82.38/x86-64/src/wl/sys/wl_linux.c bcm_sta-5.100.82.38.patch/x86-64/src/wl/sys/wl_linux.c +--- bcm_sta-5.100.82.38/x86-64/src/wl/sys/wl_linux.c 2010-12-15 03:01:09.000000000 +0100 ++++ bcm_sta-5.100.82.38.patch/x86-64/src/wl/sys/wl_linux.c 2010-12-27 22:15:18.273865927 +0100 +@@ -251,7 +251,7 @@ + #define quote_str(s) to_str(s) + + #ifndef BRCM_WLAN_IFNAME +-#define BRCM_WLAN_IFNAME eth%d ++#define BRCM_WLAN_IFNAME wlan%d + #endif + + static char name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); +diff -Naur bcm_sta-5.100.82.38/x86-64/src/wl/sys/wl_linux.c.orig bcm_sta-5.100.82.38.patch/x86-64/src/wl/sys/wl_linux.c.orig diff --git a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.60.246.6-02_rename_device-0.1.patch b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.60.246.6-02_rename_device-0.1.patch deleted file mode 100644 index f638abccc2..0000000000 --- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.60.246.6-02_rename_device-0.1.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur bcm_sta-5.60.246.6/x86-32/src/wl/sys/wl_linux.c bcm_sta-5.60.246.6.patch/x86-32/src/wl/sys/wl_linux.c ---- bcm_sta-5.60.246.6/x86-32/src/wl/sys/wl_linux.c 2010-10-22 04:18:57.000000000 +0200 -+++ bcm_sta-5.60.246.6.patch/x86-32/src/wl/sys/wl_linux.c 2010-12-02 05:17:28.037326623 +0100 -@@ -187,7 +187,7 @@ - static int nompc = 0; - module_param(nompc, int, 0); - --static char name[IFNAMSIZ] = "eth%d"; -+static char name[IFNAMSIZ] = "wlan%d"; - module_param_string(name, name, IFNAMSIZ, 0); - - #ifndef SRCBASE -diff -Naur bcm_sta-5.60.246.6/x86-64/src/wl/sys/wl_linux.c bcm_sta-5.60.246.6.patch/x86-64/src/wl/sys/wl_linux.c ---- bcm_sta-5.60.246.6/x86-64/src/wl/sys/wl_linux.c 2010-10-22 04:23:55.000000000 +0200 -+++ bcm_sta-5.60.246.6.patch/x86-64/src/wl/sys/wl_linux.c 2010-12-02 05:17:42.554495917 +0100 -@@ -187,7 +187,7 @@ - static int nompc = 0; - module_param(nompc, int, 0); - --static char name[IFNAMSIZ] = "eth%d"; -+static char name[IFNAMSIZ] = "wlan%d"; - module_param_string(name, name, IFNAMSIZ, 0); - - #ifndef SRCBASE