From 9c2cc954a165a207fc5243afe7536e3dff793f26 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 27 May 2017 12:17:06 +0200 Subject: [PATCH] broadcom-wl-dkms: fix building with linux-4.11 patch via Arch: https://aur.archlinux.org/cgit/aur.git/tree/linux411.patch?h=broadcom-wl --- .../broadcom-wl-dkms/patches/linux-4.11.patch | 52 +++++++++++++++++++ srcpkgs/broadcom-wl-dkms/template | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-4.11.patch diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-4.11.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-4.11.patch new file mode 100644 index 00000000000..c618e8a28d2 --- /dev/null +++ b/srcpkgs/broadcom-wl-dkms/patches/linux-4.11.patch @@ -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 +--- src/wl/sys/wl_cfg80211_hybrid.c ++++ src/wl/sys/wl_cfg80211_hybrid.c +@@ -30,6 +30,9 @@ + #include + #include + #include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ #include ++#endif + #include + #include + #include +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 489c9f5..f8278ad 100644 +--- src/wl/sys/wl_linux.c ++++ 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 diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template index ec40d139bd3..3917281f381 100644 --- a/srcpkgs/broadcom-wl-dkms/template +++ b/srcpkgs/broadcom-wl-dkms/template @@ -2,7 +2,7 @@ pkgname=broadcom-wl-dkms version=6.30.223.271 -revision=4 +revision=5 maintainer="Juan RP " license="Proprietary Broadcom license" homepage="http://broadcom.com"