mirror of
https://gitlab.com/nonguix/nonguix.git
synced 2024-11-26 10:25:19 +01:00
nongnu: Add broadcom-sta.
* nongnu/packages/linux.scm (broadcom-sta): New variable. * nongnu/packages/patches/broadcom-sta-debian-fix-kernel-warnings.patch: New file. * nongnu/packages/patches/broadcom-sta-fix_mac_profile_discrepancy.patch: New file. * nongnu/packages/patches/broadcom-sta-gcc.patch: New file. * nongnu/packages/patches/broadcom-sta-license.patch: New file. * nongnu/packages/patches/broadcom-sta-linux-4.11.patch: New file. * nongnu/packages/patches/broadcom-sta-linux-4.12.patch: New file. * nongnu/packages/patches/broadcom-sta-linux-4.15.patch: New file. * nongnu/packages/patches/broadcom-sta-linux-4.7.patch: New file. * nongnu/packages/patches/broadcom-sta-linux-4.8.patch: New file. * nongnu/packages/patches/broadcom-sta-linux-5.1.patch: New file. * nongnu/packages/patches/broadcom-sta-null-pointer-fix.patch: New file. * nongnu/packages/patches/broadcom-sta-rdtscl.patch: New file.
This commit is contained in:
Alex Griffin
parent
7513783896
commit
5b9fbf9474
13 changed files with 685 additions and 0 deletions
|
|
@ -15,11 +15,14 @@
|
||||||
;;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
;;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (nongnu packages linux)
|
(define-module (nongnu packages linux)
|
||||||
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix utils)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
|
#:use-module (guix build-system linux-module)
|
||||||
#:use-module (guix build-system trivial)
|
#:use-module (guix build-system trivial)
|
||||||
#:use-module (nonguix licenses))
|
#:use-module (nonguix licenses))
|
||||||
|
|
||||||
|
|
@ -171,6 +174,66 @@ support for 5GHz and 802.11ac, among others.")
|
||||||
"https://git.kernel.org/pub/scm/linux/kernel/git/firmware"
|
"https://git.kernel.org/pub/scm/linux/kernel/git/firmware"
|
||||||
"/linux-firmware.git/plain/LICENCE.iwlwifi_firmware")))))
|
"/linux-firmware.git/plain/LICENCE.iwlwifi_firmware")))))
|
||||||
|
|
||||||
|
(define-public broadcom-sta
|
||||||
|
(package
|
||||||
|
(name "broadcom-sta")
|
||||||
|
(version "6.30.223.271")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch/tarbomb)
|
||||||
|
(uri (string-append "https://docs.broadcom.com/docs-and-downloads/"
|
||||||
|
"docs/linux_sta/hybrid-v35_64-nodebug-pcoem-"
|
||||||
|
(string-replace-substring version "." "_")
|
||||||
|
".tar.gz"))
|
||||||
|
(patches
|
||||||
|
(parameterize
|
||||||
|
((%patch-path
|
||||||
|
(map (lambda (directory)
|
||||||
|
(string-append directory "/nongnu/packages/patches"))
|
||||||
|
%load-path)))
|
||||||
|
;; https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/broadcom-sta
|
||||||
|
;; https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/broadcom-wl-dkms
|
||||||
|
(search-patches "broadcom-sta-gcc.patch"
|
||||||
|
"broadcom-sta-license.patch"
|
||||||
|
"broadcom-sta-null-pointer-fix.patch"
|
||||||
|
"broadcom-sta-rdtscl.patch"
|
||||||
|
"broadcom-sta-linux-4.7.patch"
|
||||||
|
"broadcom-sta-linux-4.8.patch"
|
||||||
|
"broadcom-sta-debian-fix-kernel-warnings.patch"
|
||||||
|
"broadcom-sta-linux-4.11.patch"
|
||||||
|
"broadcom-sta-linux-4.12.patch"
|
||||||
|
"broadcom-sta-linux-4.15.patch"
|
||||||
|
"broadcom-sta-fix_mac_profile_discrepancy.patch"
|
||||||
|
"broadcom-sta-linux-5.1.patch")))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1gj485qqr190idilacpxwgqyw21il03zph2rddizgj7fbd6pfyaz"))))
|
||||||
|
(build-system linux-module-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:linux ,linux
|
||||||
|
#:tests? #f))
|
||||||
|
(supported-systems '("x86_64-linux"))
|
||||||
|
(home-page "https://www.broadcom.com/support/802.11")
|
||||||
|
(synopsis "Broadcom 802.11 Linux STA wireless driver")
|
||||||
|
(description "This package contains Broadcom's IEEE 802.11a/b/g/n/ac hybrid
|
||||||
|
Linux device driver for the following chipsets:
|
||||||
|
@itemize
|
||||||
|
@item BCM4311
|
||||||
|
@item BCM4312
|
||||||
|
@item BCM4313
|
||||||
|
@item BCM4321
|
||||||
|
@item BCM4322
|
||||||
|
@item BCM43224
|
||||||
|
@item BCM43225
|
||||||
|
@item BCM43227
|
||||||
|
@item BCM43228
|
||||||
|
@item BCM43142
|
||||||
|
@item BCM4331
|
||||||
|
@item BCM4352
|
||||||
|
@item BCM4360
|
||||||
|
@end itemize")
|
||||||
|
(license (nonfree "https://www.broadcom.com/support/802.11"))))
|
||||||
|
|
||||||
(define-public broadcom-bt-firmware
|
(define-public broadcom-bt-firmware
|
||||||
(package
|
(package
|
||||||
(name "broadcom-bt-firmware")
|
(name "broadcom-bt-firmware")
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,161 @@
|
||||||
|
--- a/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
@@ -1968,7 +1968,7 @@
|
||||||
|
|
||||||
|
if (dtoh32(bi->length) > WL_BSS_INFO_MAX) {
|
||||||
|
WL_DBG(("Beacon is larger than buffer. Discarding\n"));
|
||||||
|
- return err;
|
||||||
|
+ return -E2BIG;
|
||||||
|
}
|
||||||
|
notif_bss_info = kzalloc(sizeof(*notif_bss_info) + sizeof(*mgmt) - sizeof(u8) +
|
||||||
|
WL_BSS_INFO_MAX, GFP_KERNEL);
|
||||||
|
@@ -1992,9 +1992,15 @@
|
||||||
|
beacon_proberesp->capab_info = cpu_to_le16(bi->capability);
|
||||||
|
wl_rst_ie(wl);
|
||||||
|
|
||||||
|
- wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length);
|
||||||
|
- wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX -
|
||||||
|
+ err = wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length);
|
||||||
|
+ if (err)
|
||||||
|
+ goto inform_single_bss_out;
|
||||||
|
+
|
||||||
|
+ err = wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX -
|
||||||
|
offsetof(struct wl_cfg80211_bss_info, frame_buf));
|
||||||
|
+ if (err)
|
||||||
|
+ goto inform_single_bss_out;
|
||||||
|
+
|
||||||
|
notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) +
|
||||||
|
wl_get_ielen(wl);
|
||||||
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
|
||||||
|
@@ -2006,14 +2012,14 @@
|
||||||
|
#endif
|
||||||
|
if (freq == 0) {
|
||||||
|
WL_ERR(("Invalid channel, fail to chcnage channel to freq\n"));
|
||||||
|
- kfree(notif_bss_info);
|
||||||
|
- return -EINVAL;
|
||||||
|
+ err = -EINVAL;
|
||||||
|
+ goto inform_single_bss_out;
|
||||||
|
}
|
||||||
|
channel = ieee80211_get_channel(wiphy, freq);
|
||||||
|
if (unlikely(!channel)) {
|
||||||
|
WL_ERR(("ieee80211_get_channel error\n"));
|
||||||
|
- kfree(notif_bss_info);
|
||||||
|
- return -EINVAL;
|
||||||
|
+ err = -EINVAL;
|
||||||
|
+ goto inform_single_bss_out;
|
||||||
|
}
|
||||||
|
|
||||||
|
WL_DBG(("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM\n",
|
||||||
|
@@ -2021,28 +2027,37 @@
|
||||||
|
mgmt->u.beacon.capab_info, &bi->BSSID));
|
||||||
|
|
||||||
|
signal = notif_bss_info->rssi * 100;
|
||||||
|
- cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt,
|
||||||
|
- le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL);
|
||||||
|
- if (unlikely(!cbss)) {
|
||||||
|
- WL_ERR(("cfg80211_inform_bss_frame error\n"));
|
||||||
|
- kfree(notif_bss_info);
|
||||||
|
- return -EINVAL;
|
||||||
|
- }
|
||||||
|
|
||||||
|
- notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
|
||||||
|
- notify_ielen = le32_to_cpu(bi->ie_length);
|
||||||
|
+ if (!wl->scan_request) {
|
||||||
|
+ cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt,
|
||||||
|
+ le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL);
|
||||||
|
+ if (unlikely(!cbss)) {
|
||||||
|
+ WL_ERR(("cfg80211_inform_bss_frame error\n"));
|
||||||
|
+ err = -ENOMEM;
|
||||||
|
+ goto inform_single_bss_out;
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
|
||||||
|
+ notify_ielen = le32_to_cpu(bi->ie_length);
|
||||||
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
|
||||||
|
- cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
|
||||||
|
- 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
|
||||||
|
- (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
|
||||||
|
+ cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
|
||||||
|
+ 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
|
||||||
|
+ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
|
||||||
|
#else
|
||||||
|
- cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet),
|
||||||
|
- 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
|
||||||
|
- (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
|
||||||
|
+ cbss = cfg80211_inform_bss(wiphy, channel,
|
||||||
|
+ wl->active_scan ?
|
||||||
|
+ CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON,
|
||||||
|
+ (const u8 *)(bi->BSSID.octet), 0,
|
||||||
|
+ beacon_proberesp->capab_info,
|
||||||
|
+ beacon_proberesp->beacon_int,
|
||||||
|
+ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
|
||||||
|
#endif
|
||||||
|
-
|
||||||
|
- if (unlikely(!cbss))
|
||||||
|
- return -ENOMEM;
|
||||||
|
+ if (unlikely(!cbss)) {
|
||||||
|
+ WL_ERR(("cfg80211_inform_bss error\n"));
|
||||||
|
+ err = -ENOMEM;
|
||||||
|
+ goto inform_single_bss_out;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
|
||||||
|
cfg80211_put_bss(wiphy, cbss);
|
||||||
|
@@ -2050,6 +2065,7 @@
|
||||||
|
cfg80211_put_bss(cbss);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+inform_single_bss_out:
|
||||||
|
kfree(notif_bss_info);
|
||||||
|
|
||||||
|
return err;
|
||||||
|
@@ -2316,6 +2332,9 @@
|
||||||
|
if (err)
|
||||||
|
goto update_bss_info_out;
|
||||||
|
|
||||||
|
+ bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
|
||||||
|
+ ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
|
||||||
|
+
|
||||||
|
ie = ((u8 *)bi) + bi->ie_offset;
|
||||||
|
ie_len = bi->ie_length;
|
||||||
|
} else {
|
||||||
|
@@ -2328,11 +2347,18 @@
|
||||||
|
ie_len = bss->len_information_elements;
|
||||||
|
#endif
|
||||||
|
wl->conf->channel = *bss->channel;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (bss) {
|
||||||
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
|
||||||
|
cfg80211_put_bss(wiphy, bss);
|
||||||
|
#else
|
||||||
|
cfg80211_put_bss(bss);
|
||||||
|
#endif
|
||||||
|
+ } else {
|
||||||
|
+ WL_DBG(("Could not update BSS\n"));
|
||||||
|
+ err = -EINVAL;
|
||||||
|
+ goto update_bss_info_out;
|
||||||
|
}
|
||||||
|
|
||||||
|
tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
|
||||||
|
@@ -2360,10 +2386,17 @@
|
||||||
|
struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
|
||||||
|
s32 err = 0;
|
||||||
|
|
||||||
|
- wl_get_assoc_ies(wl);
|
||||||
|
+ err = wl_get_assoc_ies(wl);
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+
|
||||||
|
memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
|
||||||
|
memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
|
||||||
|
- wl_update_bss_info(wl);
|
||||||
|
+
|
||||||
|
+ err = wl_update_bss_info(wl);
|
||||||
|
+ if (err)
|
||||||
|
+ return err;
|
||||||
|
+
|
||||||
|
cfg80211_roamed(ndev,
|
||||||
|
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
|
||||||
|
&wl->conf->channel,
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
https://bugs.archlinux.org/task/61090
|
||||||
|
|
||||||
|
--- a/src/wl/sys/wl_cfg80211_hybrid.c 2015-09-19 00:47:30.000000000 +0200
|
||||||
|
+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2018-11-14 14:06:03.313487995 +0100
|
||||||
|
@@ -1444,11 +1444,10 @@
|
||||||
|
s32 rate;
|
||||||
|
s32 err = 0;
|
||||||
|
|
||||||
|
if (memcmp(mac, wl->profile->bssid, ETHER_ADDR_LEN)) {
|
||||||
|
WL_ERR(("Wrong Mac address, mac = %pM profile =%pM\n", mac, wl->profile->bssid));
|
||||||
|
- return -ENOENT;
|
||||||
|
}
|
||||||
|
|
||||||
|
err = wl_dev_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate));
|
||||||
|
if (err) {
|
||||||
|
WL_DBG(("Could not get rate (%d)\n", err));
|
||||||
11
nongnu/packages/patches/broadcom-sta-gcc.patch
Normal file
11
nongnu/packages/patches/broadcom-sta-gcc.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/Makefile 2014-06-26 10:42:08.000000000 +0000
|
||||||
|
+++ b/Makefile 2014-07-17 22:44:01.662297228 +0000
|
||||||
|
@@ -126,6 +126,8 @@
|
||||||
|
EXTRA_CFLAGS += -I$(src)/src/shared/bcmwifi/include
|
||||||
|
#EXTRA_CFLAGS += -DBCMDBG_ASSERT -DBCMDBG_ERR
|
||||||
|
|
||||||
|
+EXTRA_CFLAGS += -Wno-date-time
|
||||||
|
+
|
||||||
|
EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped
|
||||||
|
|
||||||
|
KBASE ?= /lib/modules/`uname -r`
|
||||||
13
nongnu/packages/patches/broadcom-sta-license.patch
Normal file
13
nongnu/packages/patches/broadcom-sta-license.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
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
|
||||||
|
@@ -171,6 +171,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");
|
||||||
|
+
|
||||||
|
#if defined(WL_CONFIG_RFKILL)
|
||||||
|
#include <linux/rfkill.h>
|
||||||
|
static int wl_init_rfkill(wl_info_t *wl);
|
||||||
|
|
||||||
52
nongnu/packages/patches/broadcom-sta-linux-4.11.patch
Normal file
52
nongnu/packages/patches/broadcom-sta-linux-4.11.patch
Normal file
|
|
@ -0,0 +1,52 @@
|
||||||
|
diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
index a9671e2..da36405 100644
|
||||||
|
--- a/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
@@ -30,6 +30,9 @@
|
||||||
|
#include <linux/kthread.h>
|
||||||
|
#include <linux/netdevice.h>
|
||||||
|
#include <linux/ieee80211.h>
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
|
||||||
|
+#include <linux/sched/signal.h>
|
||||||
|
+#endif
|
||||||
|
#include <net/cfg80211.h>
|
||||||
|
#include <linux/nl80211.h>
|
||||||
|
#include <net/rtnetlink.h>
|
||||||
|
diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
|
||||||
|
index 489c9f5..f8278ad 100644
|
||||||
|
--- a/src/wl/sys/wl_linux.c
|
||||||
|
+++ b/src/wl/sys/wl_linux.c
|
||||||
|
@@ -117,6 +117,9 @@ int wl_found = 0;
|
||||||
|
|
||||||
|
typedef struct priv_link {
|
||||||
|
wl_if_t *wlif;
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
|
||||||
|
+ unsigned long last_rx;
|
||||||
|
+#endif
|
||||||
|
} priv_link_t;
|
||||||
|
|
||||||
|
#define WL_DEV_IF(dev) ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif)
|
||||||
|
@@ -2450,6 +2453,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
|
||||||
|
{
|
||||||
|
struct sk_buff *oskb = (struct sk_buff *)p;
|
||||||
|
struct sk_buff *skb;
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
|
||||||
|
+ priv_link_t *priv_link;
|
||||||
|
+#endif
|
||||||
|
uchar *pdata;
|
||||||
|
uint len;
|
||||||
|
|
||||||
|
@@ -2916,7 +2922,13 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
|
||||||
|
if (skb == NULL) return;
|
||||||
|
|
||||||
|
skb->dev = wl->monitor_dev;
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
|
||||||
|
+ priv_link = MALLOC(wl->osh, sizeof(priv_link_t));
|
||||||
|
+ priv_link = netdev_priv(skb->dev);
|
||||||
|
+ priv_link->last_rx = jiffies;
|
||||||
|
+#else
|
||||||
|
skb->dev->last_rx = jiffies;
|
||||||
|
+#endif
|
||||||
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
|
||||||
|
skb_reset_mac_header(skb);
|
||||||
|
#else
|
||||||
68
nongnu/packages/patches/broadcom-sta-linux-4.12.patch
Normal file
68
nongnu/packages/patches/broadcom-sta-linux-4.12.patch
Normal file
|
|
@ -0,0 +1,68 @@
|
||||||
|
diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
index da36405..d3741eb 100644
|
||||||
|
--- a/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
||||||
|
+ enum nl80211_iftype type, struct vif_params *params);
|
||||||
|
+#else
|
||||||
|
enum nl80211_iftype type, u32 *flags, struct vif_params *params);
|
||||||
|
+#endif
|
||||||
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
|
||||||
|
static s32
|
||||||
|
wl_cfg80211_scan(struct wiphy *wiphy,
|
||||||
|
@@ -466,7 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
|
||||||
|
|
||||||
|
static s32
|
||||||
|
wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
||||||
|
+ enum nl80211_iftype type,
|
||||||
|
+#else
|
||||||
|
enum nl80211_iftype type, u32 *flags,
|
||||||
|
+#endif
|
||||||
|
struct vif_params *params)
|
||||||
|
{
|
||||||
|
struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
|
||||||
|
@@ -2361,6 +2369,20 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
|
||||||
|
const wl_event_msg_t *e, void *data)
|
||||||
|
{
|
||||||
|
struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
||||||
|
+ struct cfg80211_bss *bss;
|
||||||
|
+ struct wlc_ssid *ssid;
|
||||||
|
+ ssid = &wl->profile->ssid;
|
||||||
|
+ bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
|
||||||
|
+ ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
|
||||||
|
+ struct cfg80211_roam_info roam_info = {
|
||||||
|
+ .bss = bss,
|
||||||
|
+ .req_ie = conn_info->req_ie,
|
||||||
|
+ .req_ie_len = conn_info->req_ie_len,
|
||||||
|
+ .resp_ie = conn_info->resp_ie,
|
||||||
|
+ .resp_ie_len = conn_info->resp_ie_len,
|
||||||
|
+ };
|
||||||
|
+#endif
|
||||||
|
s32 err = 0;
|
||||||
|
|
||||||
|
wl_get_assoc_ies(wl);
|
||||||
|
@@ -2368,12 +2390,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
|
||||||
|
memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
|
||||||
|
wl_update_bss_info(wl);
|
||||||
|
cfg80211_roamed(ndev,
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
||||||
|
+ &roam_info,
|
||||||
|
+#else
|
||||||
|
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
|
||||||
|
&wl->conf->channel,
|
||||||
|
#endif
|
||||||
|
(u8 *)&wl->bssid,
|
||||||
|
conn_info->req_ie, conn_info->req_ie_len,
|
||||||
|
- conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
|
||||||
|
+ conn_info->resp_ie, conn_info->resp_ie_len,
|
||||||
|
+#endif
|
||||||
|
+ GFP_KERNEL);
|
||||||
|
WL_DBG(("Report roaming result\n"));
|
||||||
|
|
||||||
|
set_bit(WL_STATUS_CONNECTED, &wl->status);
|
||||||
47
nongnu/packages/patches/broadcom-sta-linux-4.15.patch
Normal file
47
nongnu/packages/patches/broadcom-sta-linux-4.15.patch
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
See: https://lkml.org/lkml/2017/11/25/90
|
||||||
|
|
||||||
|
diff -urNZ a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
|
||||||
|
--- a/src/wl/sys/wl_linux.c 2015-09-18 22:47:30.000000000 +0000
|
||||||
|
+++ b/src/wl/sys/wl_linux.c 2018-01-31 22:52:10.859856221 +0000
|
||||||
|
@@ -93,7 +93,11 @@
|
||||||
|
|
||||||
|
#include <wlc_wowl.h>
|
||||||
|
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||||
|
+static void wl_timer(struct timer_list *tl);
|
||||||
|
+#else
|
||||||
|
static void wl_timer(ulong data);
|
||||||
|
+#endif
|
||||||
|
static void _wl_timer(wl_timer_t *t);
|
||||||
|
static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
|
||||||
|
|
||||||
|
@@ -2298,9 +2302,15 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||||
|
+wl_timer(struct timer_list *tl)
|
||||||
|
+{
|
||||||
|
+ wl_timer_t *t = from_timer(t, tl, timer);
|
||||||
|
+#else
|
||||||
|
wl_timer(ulong data)
|
||||||
|
{
|
||||||
|
wl_timer_t *t = (wl_timer_t *)data;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
if (!WL_ALL_PASSIVE_ENAB(t->wl))
|
||||||
|
_wl_timer(t);
|
||||||
|
@@ -2352,9 +2362,13 @@
|
||||||
|
|
||||||
|
bzero(t, sizeof(wl_timer_t));
|
||||||
|
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||||
|
+ timer_setup(&t->timer, wl_timer, 0);
|
||||||
|
+#else
|
||||||
|
init_timer(&t->timer);
|
||||||
|
t->timer.data = (ulong) t;
|
||||||
|
t->timer.function = wl_timer;
|
||||||
|
+#endif
|
||||||
|
t->wl = wl;
|
||||||
|
t->fn = fn;
|
||||||
|
t->arg = arg;
|
||||||
109
nongnu/packages/patches/broadcom-sta-linux-4.7.patch
Normal file
109
nongnu/packages/patches/broadcom-sta-linux-4.7.patch
Normal file
|
|
@ -0,0 +1,109 @@
|
||||||
|
Since Linux 4.7, the enum ieee80211_band is no longer used
|
||||||
|
|
||||||
|
This shall cause no problem's since both enums ieee80211_band
|
||||||
|
and nl80211_band were added in the same commit:
|
||||||
|
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=13ae75b103e07304a34ab40c9136e9f53e06475c
|
||||||
|
|
||||||
|
This patch refactors the references of IEEE80211_BAND_* to NL80211_BAND_*
|
||||||
|
|
||||||
|
Reference:
|
||||||
|
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=57fbcce37be7c1d2622b56587c10ade00e96afa3
|
||||||
|
|
||||||
|
--- a/src/wl/sys/wl_cfg80211_hybrid.c 2016-06-13 11:57:36.159340297 -0500
|
||||||
|
+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2016-06-13 11:58:18.442323435 -0500
|
||||||
|
@@ -236,7 +236,7 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define CHAN2G(_channel, _freq, _flags) { \
|
||||||
|
- .band = IEEE80211_BAND_2GHZ, \
|
||||||
|
+ .band = NL80211_BAND_2GHZ, \
|
||||||
|
.center_freq = (_freq), \
|
||||||
|
.hw_value = (_channel), \
|
||||||
|
.flags = (_flags), \
|
||||||
|
@@ -245,7 +245,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
#define CHAN5G(_channel, _flags) { \
|
||||||
|
- .band = IEEE80211_BAND_5GHZ, \
|
||||||
|
+ .band = NL80211_BAND_5GHZ, \
|
||||||
|
.center_freq = 5000 + (5 * (_channel)), \
|
||||||
|
.hw_value = (_channel), \
|
||||||
|
.flags = (_flags), \
|
||||||
|
@@ -379,7 +379,7 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct ieee80211_supported_band __wl_band_2ghz = {
|
||||||
|
- .band = IEEE80211_BAND_2GHZ,
|
||||||
|
+ .band = NL80211_BAND_2GHZ,
|
||||||
|
.channels = __wl_2ghz_channels,
|
||||||
|
.n_channels = ARRAY_SIZE(__wl_2ghz_channels),
|
||||||
|
.bitrates = wl_g_rates,
|
||||||
|
@@ -387,7 +387,7 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct ieee80211_supported_band __wl_band_5ghz_a = {
|
||||||
|
- .band = IEEE80211_BAND_5GHZ,
|
||||||
|
+ .band = NL80211_BAND_5GHZ,
|
||||||
|
.channels = __wl_5ghz_a_channels,
|
||||||
|
.n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
|
||||||
|
.bitrates = wl_a_rates,
|
||||||
|
@@ -395,7 +395,7 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct ieee80211_supported_band __wl_band_5ghz_n = {
|
||||||
|
- .band = IEEE80211_BAND_5GHZ,
|
||||||
|
+ .band = NL80211_BAND_5GHZ,
|
||||||
|
.channels = __wl_5ghz_n_channels,
|
||||||
|
.n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
|
||||||
|
.bitrates = wl_a_rates,
|
||||||
|
@@ -1876,8 +1876,8 @@
|
||||||
|
wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
|
||||||
|
#endif
|
||||||
|
wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
|
||||||
|
- wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
|
||||||
|
- wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a;
|
||||||
|
+ wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
|
||||||
|
+ wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a;
|
||||||
|
wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
|
||||||
|
wdev->wiphy->cipher_suites = __wl_cipher_suites;
|
||||||
|
wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
|
||||||
|
@@ -2000,7 +2000,7 @@
|
||||||
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
|
||||||
|
freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
|
||||||
|
(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ?
|
||||||
|
- IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
|
||||||
|
+ NL80211_BAND_2GHZ : NL80211_BAND_5GHZ);
|
||||||
|
#else
|
||||||
|
freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
|
||||||
|
#endif
|
||||||
|
@@ -2116,7 +2116,7 @@
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
chan = wf_chspec_ctlchan(chanspec);
|
||||||
|
- band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
|
||||||
|
+ band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
|
||||||
|
freq = ieee80211_channel_to_frequency(chan, band);
|
||||||
|
channel = ieee80211_get_channel(wiphy, freq);
|
||||||
|
cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
|
||||||
|
@@ -2250,10 +2250,10 @@
|
||||||
|
join_params->params.chanspec_list[0] =
|
||||||
|
ieee80211_frequency_to_channel(chan->center_freq);
|
||||||
|
|
||||||
|
- if (chan->band == IEEE80211_BAND_2GHZ) {
|
||||||
|
+ if (chan->band == NL80211_BAND_2GHZ) {
|
||||||
|
chanspec |= WL_CHANSPEC_BAND_2G;
|
||||||
|
}
|
||||||
|
- else if (chan->band == IEEE80211_BAND_5GHZ) {
|
||||||
|
+ else if (chan->band == NL80211_BAND_5GHZ) {
|
||||||
|
chanspec |= WL_CHANSPEC_BAND_5G;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
@@ -2885,7 +2885,7 @@
|
||||||
|
|
||||||
|
if (phy == 'n' || phy == 'a' || phy == 'v') {
|
||||||
|
wiphy = wl_to_wiphy(wl);
|
||||||
|
- wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
|
||||||
|
+ wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n;
|
||||||
|
}
|
||||||
|
|
||||||
|
return err;
|
||||||
64
nongnu/packages/patches/broadcom-sta-linux-4.8.patch
Normal file
64
nongnu/packages/patches/broadcom-sta-linux-4.8.patch
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
From d3f93542326a06d920c6eb89b703384290d37b8b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alberto Milone <alberto.milone@canonical.com>
|
||||||
|
Date: Fri, 2 Sep 2016 17:35:34 +0200
|
||||||
|
Subject: [PATCH 1/1] Add support for Linux 4.8
|
||||||
|
|
||||||
|
Orginal author: Krzysztof Kolasa
|
||||||
|
---
|
||||||
|
src/wl/sys/wl_cfg80211_hybrid.c | 22 ++++++++++++++++++++++
|
||||||
|
1 file changed, 22 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
index 2fc71fe..ec5e472 100644
|
||||||
|
--- a/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
@@ -2388,8 +2388,16 @@ wl_bss_connect_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
|
||||||
|
s32 err = 0;
|
||||||
|
|
||||||
|
if (wl->scan_request) {
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
|
||||||
|
+ struct cfg80211_scan_info info = {
|
||||||
|
+ .aborted = true,
|
||||||
|
+ };
|
||||||
|
+ WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
|
||||||
|
+ cfg80211_scan_done(wl->scan_request, &info);
|
||||||
|
+#else
|
||||||
|
WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
|
||||||
|
cfg80211_scan_done(wl->scan_request, true);
|
||||||
|
+#endif
|
||||||
|
wl->scan_request = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2490,7 +2498,14 @@ wl_notify_scan_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
|
||||||
|
|
||||||
|
scan_done_out:
|
||||||
|
if (wl->scan_request) {
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
|
||||||
|
+ struct cfg80211_scan_info info = {
|
||||||
|
+ .aborted = false,
|
||||||
|
+ };
|
||||||
|
+ cfg80211_scan_done(wl->scan_request, &info);
|
||||||
|
+#else
|
||||||
|
cfg80211_scan_done(wl->scan_request, false);
|
||||||
|
+#endif
|
||||||
|
wl->scan_request = NULL;
|
||||||
|
}
|
||||||
|
rtnl_unlock();
|
||||||
|
@@ -2909,7 +2924,14 @@ s32 wl_cfg80211_down(struct net_device *ndev)
|
||||||
|
s32 err = 0;
|
||||||
|
|
||||||
|
if (wl->scan_request) {
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
|
||||||
|
+ struct cfg80211_scan_info info = {
|
||||||
|
+ .aborted = true,
|
||||||
|
+ };
|
||||||
|
+ cfg80211_scan_done(wl->scan_request, &info);
|
||||||
|
+#else
|
||||||
|
cfg80211_scan_done(wl->scan_request, true);
|
||||||
|
+#endif
|
||||||
|
wl->scan_request = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
32
nongnu/packages/patches/broadcom-sta-linux-5.1.patch
Normal file
32
nongnu/packages/patches/broadcom-sta-linux-5.1.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
commit bcb06af629a36eb84f9a35ac599ec7e51e2d39fb
|
||||||
|
Author: georgewhewell <georgerw@gmail.com>
|
||||||
|
Date: Sat May 18 21:22:37 2019 +0100
|
||||||
|
|
||||||
|
find src -type f -name \'*.c\' -exec sed -i "s/get_ds()/KERNEL_DS/g" {} \;
|
||||||
|
|
||||||
|
diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
index 7b606e0..51c81bc 100644
|
||||||
|
--- a/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
|
||||||
|
@@ -450,7 +450,7 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
|
||||||
|
ifr.ifr_data = (caddr_t)&ioc;
|
||||||
|
|
||||||
|
fs = get_fs();
|
||||||
|
- set_fs(get_ds());
|
||||||
|
+ set_fs(KERNEL_DS);
|
||||||
|
#if defined(WL_USE_NETDEV_OPS)
|
||||||
|
err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
|
||||||
|
#else
|
||||||
|
diff --git a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c
|
||||||
|
index c4c610b..9c3c74e 100644
|
||||||
|
--- a/src/wl/sys/wl_iw.c
|
||||||
|
+++ b/src/wl/sys/wl_iw.c
|
||||||
|
@@ -117,7 +117,7 @@ dev_wlc_ioctl(
|
||||||
|
ifr.ifr_data = (caddr_t) &ioc;
|
||||||
|
|
||||||
|
fs = get_fs();
|
||||||
|
- set_fs(get_ds());
|
||||||
|
+ set_fs(KERNEL_DS);
|
||||||
|
#if defined(WL_USE_NETDEV_OPS)
|
||||||
|
ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
|
||||||
|
#else
|
||||||
27
nongnu/packages/patches/broadcom-sta-null-pointer-fix.patch
Normal file
27
nongnu/packages/patches/broadcom-sta-null-pointer-fix.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
Description: Fixing null pointer crash
|
||||||
|
|
||||||
|
Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773713
|
||||||
|
Bug-Ubuntu: https://launchpad.net/bugs/1415880
|
||||||
|
Last-Update: 2015-08-18
|
||||||
|
|
||||||
|
---
|
||||||
|
src/wl/sys/wl_linux.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
|
||||||
|
index 860b935..295156f 100644
|
||||||
|
--- a/src/wl/sys/wl_linux.c
|
||||||
|
+++ b/src/wl/sys/wl_linux.c
|
||||||
|
@@ -2157,8 +2157,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
|
||||||
|
wlif = WL_DEV_IF(dev);
|
||||||
|
wl = WL_INFO(dev);
|
||||||
|
|
||||||
|
+ skb->prev = NULL;
|
||||||
|
if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
|
||||||
|
- skb->prev = NULL;
|
||||||
|
|
||||||
|
TXQ_LOCK(wl);
|
||||||
|
|
||||||
|
--
|
||||||
|
1.9.1
|
||||||
|
|
||||||
22
nongnu/packages/patches/broadcom-sta-rdtscl.patch
Normal file
22
nongnu/packages/patches/broadcom-sta-rdtscl.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
Since Linux 4.3, rdtscl() is no longer available and native_read_tsc()
|
||||||
|
is renamed to rdtsc(). Move the macro contents in-line and call the
|
||||||
|
new function. References:
|
||||||
|
|
||||||
|
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a
|
||||||
|
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=4ea1636b04dbd66536fa387bae2eea463efc705b
|
||||||
|
|
||||||
|
diff -ru a/src/shared/linux_osl.c b/src/shared/linux_osl.c
|
||||||
|
--- a/src/shared/linux_osl.c 2015-09-19 01:47:15.000000000 +0300
|
||||||
|
+++ b/src/shared/linux_osl.c 2015-11-21 15:20:30.585902518 +0200
|
||||||
|
@@ -932,7 +932,11 @@
|
||||||
|
uint cycles;
|
||||||
|
|
||||||
|
#if defined(__i386__)
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
|
||||||
|
+ cycles = (u32)rdtsc();
|
||||||
|
+#else
|
||||||
|
rdtscl(cycles);
|
||||||
|
+#endif
|
||||||
|
#else
|
||||||
|
cycles = 0;
|
||||||
|
#endif
|
||||||
Loading…
Reference in a new issue