From 7e8dddb7a545bc5ba74336ef2aafed1c0b4ceee1 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 13 Mar 2017 20:48:44 +0000 Subject: [PATCH 1/2] bcm_sta: Fix build for API changes in kernel 4.11 --- x86-64/src/wl/sys/wl_cfg80211_hybrid.c | 4 ++++ x86-64/src/wl/sys/wl_linux.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c index 7b606e0..76ef208 100644 --- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c +++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c @@ -26,6 +26,10 @@ #include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) +#include +#endif + #include #include #include diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c index 0d05100..dca7c71 100644 --- a/x86-64/src/wl/sys/wl_linux.c +++ b/x86-64/src/wl/sys/wl_linux.c @@ -26,6 +26,10 @@ #include #include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) +#include +#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) #include #endif -- 2.7.4 From 1d066a57a682af0ac42b8d1c65bf7bd1984a54ca Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 13 Mar 2017 20:49:01 +0000 Subject: [PATCH 2/2] bcm_sta: Remove usage of net_device last_rx member --- x86-64/src/wl/sys/wl_linux.c | 1 - 1 file changed, 1 deletion(-) diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c index dca7c71..f3be019 100644 --- a/x86-64/src/wl/sys/wl_linux.c +++ b/x86-64/src/wl/sys/wl_linux.c @@ -2919,7 +2919,6 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) if (skb == NULL) return; skb->dev = wl->monitor_dev; - skb->dev->last_rx = jiffies; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) skb_reset_mac_header(skb); #else -- 2.7.4