summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatsuu Takuto <matsuu@gentoo.org>2011-10-26 23:32:28 +0000
committerMatsuu Takuto <matsuu@gentoo.org>2011-10-26 23:32:28 +0000
commitc2a37505594fe46bb6a57b6d206e5c7bf1d18a00 (patch)
tree2554756d04950bc3061eb6d0ecfa91ebd2f79283 /net-wireless/broadcom-sta/files
parentVersion bumped, bug #388449. (diff)
downloadgentoo-2-c2a37505594fe46bb6a57b6d206e5c7bf1d18a00.tar.gz
gentoo-2-c2a37505594fe46bb6a57b6d206e5c7bf1d18a00.tar.bz2
gentoo-2-c2a37505594fe46bb6a57b6d206e5c7bf1d18a00.zip
Version bumped, bug #388547.
(Portage version: 2.1.10.29/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless/broadcom-sta/files')
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch13
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch12
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch11
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch21
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch51
5 files changed, 0 insertions, 108 deletions
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch
deleted file mode 100644
index 956cb5c8176c..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rup hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5.10.91.9.3_EDIT/src/wl/sys/wl_linux.c
---- hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c 2009-09-10 20:21:58.000000000 +0200
-+++ hybrid-portsrc-x86_32-v5.10.91.9.3_EDIT/src/wl/sys/wl_linux.c 2009-12-07 12:51:20.000000000 +0100
-@@ -40,6 +40,9 @@
- #include <linux/pci_ids.h>
- #define WLC_MAXBSSCFG 1
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32)
-+#include <linux/sched.h>
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
- #include <net/lib80211.h>
- #endif
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch
deleted file mode 100644
index 54b114171203..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur broadcom-sta-5.10.91.9.3.orig/src/include/linuxver.h broadcom-sta-5.10.91.9.3/src/include/linuxver.h
---- broadcom-sta-5.10.91.9.3.orig/src/include/linuxver.h 2009-09-16 07:25:27.000000000 +0900
-+++ broadcom-sta-5.10.91.9.3/src/include/linuxver.h 2010-01-16 08:20:12.000000000 +0900
-@@ -19,6 +19,8 @@
- #include <linux/version.h>
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
- #include <linux/config.h>
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33))
-+#include <generated/autoconf.h>
- #else
- #include <linux/autoconf.h>
- #endif
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch
deleted file mode 100644
index 048565376d75..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h
---- broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h 2010-10-08 07:32:59.000000000 +0900
-+++ broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h 2010-10-28 00:50:57.925351964 +0900
-@@ -15,6 +15,7 @@
- #ifndef _wl_iw_h_
- #define _wl_iw_h_
-
-+#include <linux/semaphore.h>
- #include <linux/wireless.h>
-
- #include <typedefs.h>
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch
deleted file mode 100644
index 9ac6b9ec9e8f..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur broadcom-sta-5.60.246.2.orig/src/wl/sys/wl_linux.c broadcom-sta-5.60.246.2/src/wl/sys/wl_linux.c
---- broadcom-sta-5.60.246.2.orig/src/wl/sys/wl_linux.c 2010-10-01 03:53:22.000000000 +0900
-+++ broadcom-sta-5.60.246.2/src/wl/sys/wl_linux.c 2010-10-30 15:29:48.000000000 +0900
-@@ -1415,7 +1415,7 @@
- static void
- _wl_set_multicast_list(struct net_device *dev)
- {
--#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 33)
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
- struct dev_mc_list *mclist;
- #else
- struct netdev_hw_addr *ha;
-@@ -1435,7 +1435,7 @@
- if (wl->pub->up) {
- wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
-
--#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 33)
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
- for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
- i++, mclist = mclist->next) {
- if (i >= MAXMULTILIST) {
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch
deleted file mode 100644
index a31ba97e7255..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_iw.h broadcom-sta-5.60.48.36/src/wl/sys/wl_iw.h
---- broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_iw.h 2010-02-06 10:59:15.000000000 +0900
-+++ broadcom-sta-5.60.48.36/src/wl/sys/wl_iw.h 2010-06-05 09:32:46.000000000 +0900
-@@ -15,6 +15,7 @@
- #ifndef _wl_iw_h_
- #define _wl_iw_h_
-
-+#include <linux/semaphore.h>
- #include <linux/wireless.h>
-
- #include <typedefs.h>
-diff -Naur broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_linux.c broadcom-sta-5.60.48.36/src/wl/sys/wl_linux.c
---- broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_linux.c 2010-02-06 10:59:15.000000000 +0900
-+++ broadcom-sta-5.60.48.36/src/wl/sys/wl_linux.c 2010-06-04 08:25:22.000000000 +0900
-@@ -1416,8 +1416,13 @@
- _wl_set_multicast_list(struct net_device *dev)
- {
- wl_info_t *wl;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+ struct netdev_hw_addr *ha;
-+ int i=0;
-+#else
- struct dev_mc_list *mclist;
- int i;
-+#endif
-
- if (!dev)
- return;
-@@ -1430,14 +1435,22 @@
- if (wl->pub->up) {
- wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+ netdev_for_each_mc_addr(ha, dev) {
-+#else
- for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
- i++, mclist = mclist->next) {
-+#endif
- if (i >= MAXMULTILIST) {
- wl->pub->allmulti = TRUE;
- i = 0;
- break;
- }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+ wl->pub->multicast[i] = *((struct ether_addr*) ha->addr);
-+#else
- wl->pub->multicast[i] = *((struct ether_addr*) mclist->dmi_addr);
-+#endif
- }
- wl->pub->nmulticast = i;
- wlc_set(wl->wlc, WLC_SET_PROMISC, (dev->flags & IFF_PROMISC));