diff options
| author | georgewhewell <georgerw@gmail.com> | 2017-06-02 14:19:04 +0100 |
|---|---|---|
| committer | georgewhewell <georgerw@gmail.com> | 2017-06-02 14:19:04 +0100 |
| commit | daf674491eab3e68a653308ba36f5e5005fd58a7 (patch) | |
| tree | 7466df62825e55a4dde6b4d14f389cde5fd7cc6e /pkgs/os-specific/linux/broadcom-sta | |
| parent | 5b1de5b5b85556ef6f338fea3c601660e19ee852 (diff) | |
| download | nixpkgs-daf674491eab3e68a653308ba36f5e5005fd58a7.tar nixpkgs-daf674491eab3e68a653308ba36f5e5005fd58a7.tar.gz nixpkgs-daf674491eab3e68a653308ba36f5e5005fd58a7.tar.bz2 nixpkgs-daf674491eab3e68a653308ba36f5e5005fd58a7.tar.lz nixpkgs-daf674491eab3e68a653308ba36f5e5005fd58a7.tar.xz nixpkgs-daf674491eab3e68a653308ba36f5e5005fd58a7.tar.zst nixpkgs-daf674491eab3e68a653308ba36f5e5005fd58a7.zip | |
broadcom-sta: add patch for kernel 4.11+
Diffstat (limited to 'pkgs/os-specific/linux/broadcom-sta')
| -rw-r--r-- | pkgs/os-specific/linux/broadcom-sta/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch | 52 |
2 files changed, 54 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 8b2bac38438..2723e662b79 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation { ./linux-4.7.patch # source: https://git.archlinux.org/svntogit/community.git/tree/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms ./linux-4.8.patch + # source: https://aur.archlinux.org/cgit/aur.git/tree/linux411.patch?h=broadcom-wl + ./linux-4.11.patch ./null-pointer-fix.patch ./gcc.patch ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch new file mode 100644 index 00000000000..a779f8c84cf --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/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 +--- 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 |