summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Brewer <tomboy64@sina.cn>2016-02-06 04:25:44 +0100
committerMatthew Brewer <tomboy64@sina.cn>2016-02-09 17:53:27 +0100
commit156954e2a0e304b68faf11e59ed00a88723b8f60 (patch)
treee6d22f800e7b109dfede2202ace407e8f40a70f1 /net-wireless/broadcom-sta/files
parentkde-apps/kdebugsettings: backport patch from upstream to remove unused depend... (diff)
downloadgentoo-156954e2a0e304b68faf11e59ed00a88723b8f60.tar.gz
gentoo-156954e2a0e304b68faf11e59ed00a88723b8f60.tar.bz2
gentoo-156954e2a0e304b68faf11e59ed00a88723b8f60.zip
net-wireless/broadcom-sta: cleaning out old revisions
Package-Manager: portage-2.2.26 RepoMan-Options: --ignore-arches
Diffstat (limited to 'net-wireless/broadcom-sta/files')
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-license.patch12
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch21
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-2.6.39.patch11
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.2-with-multicast.patch14
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.4.patch12
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.6.patch60
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.8.patch71
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.9.patch14
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-remove-rssi-errors.patch32
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-gcc.patch11
10 files changed, 0 insertions, 258 deletions
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-license.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-license.patch
deleted file mode 100644
index b320d977e8b0..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-license.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c
---- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 02:48:59.000000000 +0900
-+++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c 2009-05-08 00:48:20.000000000 +0900
-@@ -163,6 +163,8 @@
- static void wl_free_if(wl_info_t *wl, wl_if_t *wlif);
- static void wl_get_driver_info(struct net_device *dev, struct ethtool_drvinfo *info);
-
-+MODULE_LICENSE("MIXED/Proprietary");
-+
- static struct pci_device_id wl_id_table[] = {
- { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch
deleted file mode 100644
index a915aee67fe2..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur broadcom-sta-5.100.82.111.orig/Makefile broadcom-sta-5.100.82.111/Makefile
---- broadcom-sta-5.100.82.111.orig/Makefile 2011-10-06 08:16:10.000000000 +0900
-+++ broadcom-sta-5.100.82.111/Makefile 2011-10-24 08:54:26.000000000 +0900
-@@ -16,7 +16,7 @@
- ifneq ($(KERNELRELEASE),)
-
- LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \
-- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \
-+ if [ "$(VERSION)" -ge "3" -o "$(VERSION)" -eq "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \
- echo TRUE; \
- else \
- echo FALSE; \
-@@ -24,7 +24,7 @@
- ))
-
- LINUXVER_WEXT_ONLY:=$(strip $(shell \
-- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \
-+ if [ "$(VERSION)" -ge "3" -o "$(VERSION)" -eq "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \
- echo FALSE; \
- else \
- echo TRUE; \
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-2.6.39.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-2.6.39.patch
deleted file mode 100644
index 633b9c858d6c..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-2.6.39.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wl/sys/wl_cfg80211.c.orig 2011-10-31 07:57:38.000000000 -0400
-+++ src/wl/sys/wl_cfg80211.c 2011-10-31 07:57:46.000000000 -0400
-@@ -1811,7 +1811,7 @@
- notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) +
- wl_get_ielen(wl);
- freq = ieee80211_channel_to_frequency(notif_bss_info->channel
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
- ,(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ
- #endif
- );
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.2-with-multicast.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.2-with-multicast.patch
deleted file mode 100644
index c28bc0ee4ad6..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.2-with-multicast.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/wl/sys/wl_linux.c.old 2013-05-02 21:00:51.000000000 +0200
-+++ src/wl/sys/wl_linux.c 2013-05-02 21:04:00.000000000 +0200
-@@ -385,7 +385,11 @@
- #endif
- .ndo_get_stats = wl_get_stats,
- .ndo_set_mac_address = wl_set_mac_address,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- .ndo_set_multicast_list = wl_set_multicast_list,
-+#else
-+ .ndo_set_rx_mode = wl_set_multicast_list,
-+#endif
- .ndo_do_ioctl = wl_ioctl
- };
-
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.4.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.4.patch
deleted file mode 100644
index 2f1ad562cecc..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/wl/sys/wl_linux.c.old 2013-05-02 14:51:07.000000000 +0200
-+++ src/wl/sys/wl_linux.c 2013-05-02 14:51:14.000000000 +0200
-@@ -40,7 +40,9 @@
- #include <linux/pci_ids.h>
- #define WLC_MAXBSSCFG 1
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
- #include <asm/system.h>
-+#endif
- #include <asm/io.h>
- #include <asm/irq.h>
- #include <asm/pgtable.h>
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.6.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.6.patch
deleted file mode 100644
index 17730dbe0c04..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.6.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- work.orig/src/wl/sys/wl_cfg80211.c 2012-11-05 21:12:30.402421835 +0100
-+++ work/src/wl/sys/wl_cfg80211.c 2012-11-05 21:21:13.962421835 +0100
-@@ -40,9 +40,15 @@ u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_I
-
- static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
- enum nl80211_iftype type, u32 *flags, struct vif_params *params);
--static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-+static s32 __wl_cfg80211_scan(struct wiphy *wiphy,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
-+ struct net_device *ndev,
-+#endif
- struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid);
--static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
-+ struct net_device *ndev,
-+#endif
- struct cfg80211_scan_request *request);
- static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
- static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
-@@ -496,10 +502,16 @@ wl_cfg80211_change_iface(struct wiphy *w
- }
-
- static s32
--__wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-+__wl_cfg80211_scan(struct wiphy *wiphy,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
-+ struct net_device *ndev,
-+#endif
- struct cfg80211_scan_request *request,
- struct cfg80211_ssid *this_ssid)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
-+ struct net_device *ndev = request->wdev->netdev;
-+#endif
- struct wl_priv *wl = ndev_to_wl(ndev);
- struct cfg80211_ssid *ssids;
- struct wl_scan_req *sr = wl_to_sr(wl);
-@@ -570,13 +582,20 @@ scan_out:
- }
-
- static s32
--wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-+wl_cfg80211_scan(struct wiphy *wiphy,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
-+ struct net_device *ndev,
-+#endif
- struct cfg80211_scan_request *request)
- {
- s32 err = 0;
-
- CHECK_SYS_UP();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
- err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);
-+#else
-+ err = __wl_cfg80211_scan(wiphy, request, NULL);
-+#endif
- if (err) {
- WL_DBG(("scan error (%d)\n", err));
- return err;
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.8.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.8.patch
deleted file mode 100644
index da2ddcca437e..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.8.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- /src/include/bcmutils.h~ 2011-10-22 18:55:54.000000000 +0200
-+++ /src/include/bcmutils.h 2013-02-21 09:08:19.947034424 +0100
-@@ -555,7 +555,11 @@ extern void printbig(char *buf);
- extern void prhex(const char *msg, uchar *buf, uint len);
-
- extern bcm_tlv_t *BCMROMFN(bcm_next_tlv)(bcm_tlv_t *elt, int *buflen);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs)(void *buf, int buflen, uint key);
-+#else
-+extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs)(const void *buf, int buflen, uint key);
-+#endif
- extern bcm_tlv_t *BCMROMFN(bcm_parse_ordered_tlvs)(void *buf, int buflen, uint key);
-
- extern const char *bcmerrorstr(int bcmerror);
---- /src/wl/sys/wl_cfg80211.c~ 2013-02-21 09:06:18.971297216 +0100
-+++ /src/wl/sys/wl_cfg80211.c 2013-02-21 09:10:56.682019739 +0100
-@@ -744,7 +744,11 @@ wl_cfg80211_join_ibss(struct wiphy *wiph
- else
- memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN);
-
-- wl_ch_to_chanspec(params->channel, &join_params, &join_params_size);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-+ wl_ch_to_chanspec(params->channel, &join_params, &join_params_size);
-+#else
-+ wl_ch_to_chanspec(params->chandef.chan, &join_params, &join_params_size);
-+#endif
-
- err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size);
- if (err) {
-@@ -2047,9 +2051,14 @@ static s32 wl_update_bss_info(struct wl_
- struct bcm_tlv *tim;
- u16 beacon_interval;
- s32 dtim_period;
-- size_t ie_len;
-- u8 *ie;
- s32 err = 0;
-+ size_t ie_len;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-+ u8 *ie;
-+#else
-+ const u8 *ie;
-+ const struct cfg80211_bss_ies *ies;
-+#endif
-
- ssid = &wl->profile->ssid;
- bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
-@@ -2079,8 +2088,22 @@ static s32 wl_update_bss_info(struct wl_
- beacon_interval = cpu_to_le16(bi->beacon_period);
- } else {
- WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid));
-- ie = bss->information_elements;
-- ie_len = bss->len_information_elements;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-+ ie = bss->information_elements;
-+ ie_len = bss->len_information_elements;
-+#else
-+ rcu_read_lock();
-+ ies = (const struct cfg80211_bss_ies*)rcu_dereference(bss->ies);
-+ if (!ies) {
-+ /* This should never happen */
-+ rcu_read_unlock();
-+ err = -EIO;
-+ goto update_bss_info_out;
-+ }
-+ ie = ies->data;
-+ ie_len = (size_t)(ies->len);
-+ rcu_read_unlock();
-+#endif
- beacon_interval = bss->beacon_interval;
- cfg80211_put_bss(bss);
- }
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.9.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.9.patch
deleted file mode 100644
index e1f168f12707..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-linux-3.9.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/wl/sys/wl_cfg80211.c.old 2013-05-02 17:10:36.000000000 +0200
-+++ src/wl/sys/wl_cfg80211.c 2013-05-02 17:12:27.000000000 +0200
-@@ -2119,7 +2119,11 @@
- rcu_read_unlock();
- #endif
- beacon_interval = bss->beacon_interval;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
- cfg80211_put_bss(bss);
-+#else
-+ cfg80211_put_bss(wl_to_wiphy(wl), bss);
-+#endif
- }
-
- tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-remove-rssi-errors.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-remove-rssi-errors.patch
deleted file mode 100644
index 7f26746ee7a5..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.112-remove-rssi-errors.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur broadcom-sta-5.100.82.112.orig/amd64/src/wl/sys/wl_linux.c broadcom-sta-5.100.82.112/amd64/src/wl/sys/wl_linux.c
---- broadcom-sta-5.100.82.112.orig/amd64/src/wl/sys/wl_linux.c 2012-05-24 09:45:02.520119025 +0400
-+++ broadcom-sta-5.100.82.112/amd64/src/wl/sys/wl_linux.c 2012-05-24 09:46:52.116121834 +0400
-@@ -1581,11 +1581,7 @@
- }
-
- WL_LOCK(wl);
-- if (!capable(CAP_NET_ADMIN)) {
-- bcmerror = BCME_EPERM;
-- } else {
-- bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
-- }
-+ bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
- WL_UNLOCK(wl);
-
- done1:
-
-diff -Naur broadcom-sta-5.100.82.112.orig/amd64/src/wl/sys/wl_cfg80211.c broadcom-sta-5.100.82.112/amd64/src/wl/sys/wl_cfg80211.c
---- broadcom-sta-5.100.82.112.orig/amd64/src/wl/sys/wl_cfg80211.c 2012-05-24 09:45:33.268119813 +0400
-+++ broadcom-sta-5.100.82.112/amd64/src/wl/sys/wl_cfg80211.c 2012-05-24 09:55:30.184135098 +0400
-@@ -1466,7 +1466,10 @@
- scb_val.val = 0;
- err = wl_dev_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t));
- if (err) {
-- WL_ERR(("Could not get rssi (%d)\n", err));
-+ if (err != -EINVAL) {
-+ // Don't fill syslog with EINVAL error
-+ WL_ERR(("Could not get rssi (%d)\n", err));
-+ }
- return err;
- }
- rssi = dtoh32(scb_val.val);
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-gcc.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-gcc.patch
deleted file mode 100644
index 048565376d75..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.38-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>