From 8c856975d967111cfd84455dad508a73a7c077dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 25 Jul 2016 23:31:17 +0300 Subject: [PATCH 01/11] valid xml --- kernel/tools/cpupowertools/pspec.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/tools/cpupowertools/pspec.xml b/kernel/tools/cpupowertools/pspec.xml index 65623a6f..6f976a73 100644 --- a/kernel/tools/cpupowertools/pspec.xml +++ b/kernel/tools/cpupowertools/pspec.xml @@ -17,9 +17,9 @@ pciutils-devel - + + + From 2f02d010329ab6841e13f998be4ab565b7dd1fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 25 Jul 2016 23:42:18 +0300 Subject: [PATCH 02/11] build fail, revert --- kernel/drivers/module-broadcom-wl/pspec.xml | 11 ++--------- kernel/drivers/ndiswrapper/pspec.xml | 11 ++--------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/kernel/drivers/module-broadcom-wl/pspec.xml b/kernel/drivers/module-broadcom-wl/pspec.xml index c1f39e82..dd167593 100644 --- a/kernel/drivers/module-broadcom-wl/pspec.xml +++ b/kernel/drivers/module-broadcom-wl/pspec.xml @@ -15,7 +15,7 @@ http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz - kernel-module-headers + kernel-module-headers @@ -33,7 +33,7 @@ module-broadcom-wl - kernel + kernel module-broadcom-wl-userspace @@ -65,13 +65,6 @@ - - 2016-07-25 - 6.30.223.271 - Rebuild for new kernel. - Ertuğrul Erata - ertugrulerata@gmail.com - 2016-06-28 6.30.223.271 diff --git a/kernel/drivers/ndiswrapper/pspec.xml b/kernel/drivers/ndiswrapper/pspec.xml index 245e5058..cdd59bbe 100644 --- a/kernel/drivers/ndiswrapper/pspec.xml +++ b/kernel/drivers/ndiswrapper/pspec.xml @@ -15,7 +15,7 @@ module-ndiswrapper allows you to use Windows XP drivers for WLAN cards without proper Linux drivers. http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.59.tar.gz - kernel-module-headers + kernel-module-headers support_kernel-4.0.patch @@ -29,7 +29,7 @@ ndiswrapper - kernel + kernel /lib/modules @@ -45,13 +45,6 @@ - - 2016-07-25 - 1.59 - Rebuild for new kernel. - Ertuğrul Erata - ertugrulerata@gmail.com - 2016-06-28 1.59 From a593a3aba494d3827ebe2e0161c6d38e5945a01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Wed, 27 Jul 2016 19:10:41 +0300 Subject: [PATCH 03/11] ndiswrapper fix build with upstream.patch --- kernel/drivers/ndiswrapper/actions.py | 3 - .../ndiswrapper/files/kernel-4.2.patch | 33 ------ .../files/support_kernel-4.0.patch | 41 ------- .../drivers/ndiswrapper/files/upstream.patch | 100 ++++++++++++++++++ kernel/drivers/ndiswrapper/pspec.xml | 19 ++-- 5 files changed, 111 insertions(+), 85 deletions(-) delete mode 100644 kernel/drivers/ndiswrapper/files/kernel-4.2.patch delete mode 100644 kernel/drivers/ndiswrapper/files/support_kernel-4.0.patch create mode 100644 kernel/drivers/ndiswrapper/files/upstream.patch diff --git a/kernel/drivers/ndiswrapper/actions.py b/kernel/drivers/ndiswrapper/actions.py index cf2ed98b..087a13ab 100644 --- a/kernel/drivers/ndiswrapper/actions.py +++ b/kernel/drivers/ndiswrapper/actions.py @@ -13,9 +13,6 @@ from pisi.actionsapi import get KDIR = kerneltools.getKernelVersion() def build(): - shelltools.system("patch -p1 < ndiswrapper-1.59.patch") - shelltools.system("patch -p1 < kernel-4.2.patch") - autotools.make("-C driver KVERS_UNAME=%s" % KDIR) autotools.make("-C utils") diff --git a/kernel/drivers/ndiswrapper/files/kernel-4.2.patch b/kernel/drivers/ndiswrapper/files/kernel-4.2.patch deleted file mode 100644 index cfaad27e..00000000 --- a/kernel/drivers/ndiswrapper/files/kernel-4.2.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Npur "ndiswrapper-1 .59.orig/driver/loader.c" "ndiswrapper-1 .59/driver/loader.c" ---- "ndiswrapper-1 .59.orig/driver/loader.c" 2013-11-28 20:42:35.000000000 +0100 -+++ "ndiswrapper-1 .59/driver/loader.c" 2015-08-01 18:25:08.302141265 +0200 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - /* - Network adapter: ClassGuid = {4d36e972-e325-11ce-bfc1-08002be10318} -diff -Npur "ndiswrapper-1 .59.orig/driver/ntoskernel.c" "ndiswrapper-1 .59/driver/ntoskernel.c" ---- "ndiswrapper-1 .59.orig/driver/ntoskernel.c" 2013-11-28 20:42:36.000000000 +0100 -+++ "ndiswrapper-1 .59/driver/ntoskernel.c" 2015-08-01 18:24:55.895942032 +0200 -@@ -19,6 +19,7 @@ - #include "pnp.h" - #include "loader.h" - #include "ntoskernel_exports.h" -+#include - - /* MDLs describe a range of virtual address with an array of physical - * pages right after the header. For different ranges of virtual -diff -Npur "ndiswrapper-1 .59.orig/driver/pe_linker.c" "ndiswrapper-1 .59/driver/pe_linker.c" ---- "ndiswrapper-1 .59.orig/driver/pe_linker.c" 2013-11-28 20:42:36.000000000 +0100 -+++ "ndiswrapper-1 .59/driver/pe_linker.c" 2015-08-01 18:28:37.992752176 +0200 -@@ -25,6 +25,7 @@ - //#define DEBUGLINKER 2 - - #include "ntoskernel.h" -+#include - - #endif - diff --git a/kernel/drivers/ndiswrapper/files/support_kernel-4.0.patch b/kernel/drivers/ndiswrapper/files/support_kernel-4.0.patch deleted file mode 100644 index 97ef75d3..00000000 --- a/kernel/drivers/ndiswrapper/files/support_kernel-4.0.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Julian Andres Klode -Date: Tue, 12 May 2015 17:11:11 +0200 -Subject: Support kernel 4.0 - ---- - driver/ndis.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/driver/ndis.c b/driver/ndis.c -index 9ace34b..fafd2e7 100644 ---- a/driver/ndis.c -+++ b/driver/ndis.c -@@ -25,6 +25,10 @@ - #define MAX_ALLOCATED_NDIS_PACKETS TX_RING_SIZE - #define MAX_ALLOCATED_NDIS_BUFFERS TX_RING_SIZE - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) -+#define strncasecmp strnicmp -+#endif -+ - static struct work_struct ndis_work; - static struct nt_list ndis_work_list; - static spinlock_t ndis_work_list_lock; -@@ -438,7 +442,7 @@ static int read_setting(struct nt_list *setting_list, char *keyname, int length, - struct wrap_device_setting *setting; - mutex_lock(&loader_mutex); - nt_list_for_each_entry(setting, setting_list, list) { -- if (strnicmp(keyname, setting->name, length) == 0) { -+ if (strncasecmp(keyname, setting->name, length) == 0) { - TRACE2("setting %s='%s'", keyname, setting->value); - mutex_unlock(&loader_mutex); - *param = ndis_encode_setting(setting, type); -@@ -502,7 +506,7 @@ wstdcall void WIN_FUNC(NdisWriteConfiguration,4) - - mutex_lock(&loader_mutex); - nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) { -- if (strnicmp(keyname, setting->name, ansi.length) == 0) { -+ if (strncasecmp(keyname, setting->name, ansi.length) == 0) { - mutex_unlock(&loader_mutex); - if (ndis_decode_setting(setting, param)) - *status = NDIS_STATUS_FAILURE; diff --git a/kernel/drivers/ndiswrapper/files/upstream.patch b/kernel/drivers/ndiswrapper/files/upstream.patch new file mode 100644 index 00000000..10a4c888 --- /dev/null +++ b/kernel/drivers/ndiswrapper/files/upstream.patch @@ -0,0 +1,100 @@ +diff -Nuar ndiswrapper-1.60.orig/ChangeLog ndiswrapper-1.60/ChangeLog +--- ndiswrapper-1.60.orig/ChangeLog 2016-07-27 19:05:10.594950240 +0300 ++++ ndiswrapper-1.60/ChangeLog 2016-07-27 19:06:04.678949272 +0300 +@@ -1,7 +1,3 @@ +-Version 1.60 2016-05-01 +-======================= +-* Support for Linux kernel up to 4.5 +- + Version 1.59 2013-11-28 + ======================= + * Support for Linux kernels from 2.6.13 to 3.12 +diff -Nuar ndiswrapper-1.60.orig/driver/.gitignore ndiswrapper-1.60/driver/.gitignore +--- ndiswrapper-1.60.orig/driver/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ ndiswrapper-1.60/driver/.gitignore 2016-07-27 19:06:04.678949272 +0300 +@@ -0,0 +1,11 @@ ++*.ko ++*.mod.c ++*.o ++.*.cmd ++*_exports.h ++/.tmp_versions/ ++/Module.markers ++/Module.symvers ++/modules.order ++/ndis_exports.h ++/win2lin_stubs.h +diff -Nuar ndiswrapper-1.60.orig/driver/loader.h ndiswrapper-1.60/driver/loader.h +--- ndiswrapper-1.60.orig/driver/loader.h 2016-07-27 19:05:10.593950240 +0300 ++++ ndiswrapper-1.60/driver/loader.h 2016-07-27 19:06:09.795949180 +0300 +@@ -16,10 +16,6 @@ + #ifndef _LOADER_H_ + #define _LOADER_H_ + +-#if LINUX_VERSION_CODE > KERNEL_VERSION(4,0,0) +-#include +-#endif +- + #include "ndiswrapper.h" + + #ifndef __KERNEL__ +diff -Nuar ndiswrapper-1.60.orig/driver/ntoskernel.h ndiswrapper-1.60/driver/ntoskernel.h +--- ndiswrapper-1.60.orig/driver/ntoskernel.h 2016-07-27 19:05:10.593950240 +0300 ++++ ndiswrapper-1.60/driver/ntoskernel.h 2016-07-27 19:06:13.834949108 +0300 +@@ -46,6 +46,8 @@ + #include + #include + #include ++#include ++ + + #if !defined(CONFIG_X86) && !defined(CONFIG_X86_64) + #error "this module is for x86 or x86_64 architectures only" +@@ -358,8 +360,18 @@ + #define prandom_seed(seed) net_srandom(seed) + #endif + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) +-#define strncasecmp strnicmp ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) ++static int strncasecmp(const char *s1, const char *s2, size_t n) ++{ ++ strnicmp(s1, s2, n); ++} ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) ++static inline void netif_trans_update(struct net_device *dev) ++{ ++ dev->trans_start = jiffies; ++} + #endif + + /* TICK is 100ns */ +diff -Nuar ndiswrapper-1.60.orig/driver/wrapndis.c ndiswrapper-1.60/driver/wrapndis.c +--- ndiswrapper-1.60.orig/driver/wrapndis.c 2016-07-27 19:05:10.593950240 +0300 ++++ ndiswrapper-1.60/driver/wrapndis.c 2016-07-27 19:06:23.295948938 +0300 +@@ -704,7 +704,7 @@ + n = wnd->max_tx_packets; + n = mp_tx_packets(wnd, wnd->tx_ring_start, n); + if (n) { +- wnd->net_dev->trans_start = jiffies; ++ netif_trans_update(wnd->net_dev); + wnd->tx_ring_start = + (wnd->tx_ring_start + n) % TX_RING_SIZE; + wnd->is_tx_ring_full = 0; +diff -Nuar ndiswrapper-1.60.orig/ndiswrapper.spec ndiswrapper-1.60/ndiswrapper.spec +--- ndiswrapper-1.60.orig/ndiswrapper.spec 2016-07-27 19:05:10.594950240 +0300 ++++ ndiswrapper-1.60/ndiswrapper.spec 2016-07-27 19:06:28.472948846 +0300 +@@ -1,5 +1,5 @@ + # Define ndiswrapper_version only if it is not already defined. +-%{!?ndiswrapper_version: %define ndiswrapper_version 1.60} ++%{!?ndiswrapper_version: %define ndiswrapper_version svn} + %{!?ndiswrapper_release: %define ndiswrapper_release 1} + + # Define kernel version if not already defined +diff -Nuar ndiswrapper-1.60.orig/utils/.gitignore ndiswrapper-1.60/utils/.gitignore +--- ndiswrapper-1.60.orig/utils/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ ndiswrapper-1.60/utils/.gitignore 2016-07-27 19:06:29.224948832 +0300 +@@ -0,0 +1 @@ ++/loadndisdriver diff --git a/kernel/drivers/ndiswrapper/pspec.xml b/kernel/drivers/ndiswrapper/pspec.xml index cdd59bbe..e42135ab 100644 --- a/kernel/drivers/ndiswrapper/pspec.xml +++ b/kernel/drivers/ndiswrapper/pspec.xml @@ -13,23 +13,19 @@ driver A network driver wrapper module-ndiswrapper allows you to use Windows XP drivers for WLAN cards without proper Linux drivers. - http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.59.tar.gz + http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.60.tar.gz - kernel-module-headers + kernel-module-headers - support_kernel-4.0.patch + upstream.patch - - ndiswrapper-1.59.patch - kernel-4.2.patch - ndiswrapper - kernel + kernel /lib/modules @@ -45,6 +41,13 @@ + + 2016-07-27 + 1.60 + Release Bump, rebuild for new kernel. + PisiLinux Community + admin@pisilinux.org + 2016-06-28 1.59 From a8b6b933a57709f013ce6ee8ecccff2a0f8927e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Wed, 27 Jul 2016 19:25:45 +0300 Subject: [PATCH 04/11] module-broadcom-wl fix build --- .../patch/0018-cfg80211_disconnected.patch | 29 ----- ...a-6.30.223.248-3.18-null-pointer-fix.patch | 27 ----- ...23.248-linux-3.18-null-pointer-crash.patch | 12 -- .../module-broadcom-wl/files/patch/gcc.patch | 11 -- .../files/patch/linux-40.patch | 26 ----- .../files/patch/linux-recent.patch | 60 ---------- .../files/patch/linux47.patch | 109 ++++++++++++++++++ .../module-broadcom-wl/files/patch/wlan.patch | 11 -- kernel/drivers/module-broadcom-wl/pspec.xml | 21 +--- 9 files changed, 115 insertions(+), 191 deletions(-) delete mode 100644 kernel/drivers/module-broadcom-wl/files/patch/0018-cfg80211_disconnected.patch delete mode 100644 kernel/drivers/module-broadcom-wl/files/patch/0019-broadcom-sta-6.30.223.248-3.18-null-pointer-fix.patch delete mode 100644 kernel/drivers/module-broadcom-wl/files/patch/broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch delete mode 100644 kernel/drivers/module-broadcom-wl/files/patch/gcc.patch delete mode 100644 kernel/drivers/module-broadcom-wl/files/patch/linux-40.patch delete mode 100644 kernel/drivers/module-broadcom-wl/files/patch/linux-recent.patch create mode 100644 kernel/drivers/module-broadcom-wl/files/patch/linux47.patch delete mode 100644 kernel/drivers/module-broadcom-wl/files/patch/wlan.patch diff --git a/kernel/drivers/module-broadcom-wl/files/patch/0018-cfg80211_disconnected.patch b/kernel/drivers/module-broadcom-wl/files/patch/0018-cfg80211_disconnected.patch deleted file mode 100644 index ac0b52eb..00000000 --- a/kernel/drivers/module-broadcom-wl/files/patch/0018-cfg80211_disconnected.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b14ac6e4b871b5e15f63389ba63d1fc23a54c58b Mon Sep 17 00:00:00 2001 -From: Tim Gardner -Date: Tue, 4 Aug 2015 09:02:10 -0600 -Subject: [PATCH] cfg80211_disconnected - -Signed-off-by: Tim Gardner ---- - bcmwl-6.30.223.248+bdcom/src/src/wl/sys/wl_cfg80211_hybrid.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c -index ea0726f..0131f01 100644 ---- a/src/wl/sys/wl_cfg80211_hybrid.c -+++ b/src/wl/sys/wl_cfg80211_hybrid.c -@@ -2047,7 +2047,11 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev, - } - else if ((event == WLC_E_LINK && ~(flags & WLC_EVENT_MSG_LINK)) || - event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL); -+#else -+ cfg80211_disconnected(ndev, 0, NULL, 0, false, GFP_KERNEL); -+#endif - clear_bit(WL_STATUS_CONNECTED, &wl->status); - wl_link_down(wl); - wl_init_prof(wl->profile); --- -2.5.0 - diff --git a/kernel/drivers/module-broadcom-wl/files/patch/0019-broadcom-sta-6.30.223.248-3.18-null-pointer-fix.patch b/kernel/drivers/module-broadcom-wl/files/patch/0019-broadcom-sta-6.30.223.248-3.18-null-pointer-fix.patch deleted file mode 100644 index adef19f3..00000000 --- a/kernel/drivers/module-broadcom-wl/files/patch/0019-broadcom-sta-6.30.223.248-3.18-null-pointer-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - diff --git a/kernel/drivers/module-broadcom-wl/files/patch/broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch b/kernel/drivers/module-broadcom-wl/files/patch/broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch deleted file mode 100644 index 035593cb..00000000 --- a/kernel/drivers/module-broadcom-wl/files/patch/broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c ---- a/src/wl/sys/wl_linux.c 2015-01-06 12:33:42.981659618 +0100 -+++ b/src/wl/sys/wl_linux.c 2015-01-06 12:34:05.647395418 +0100 -@@ -2157,8 +2157,8 @@ - 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); \ No newline at end of file diff --git a/kernel/drivers/module-broadcom-wl/files/patch/gcc.patch b/kernel/drivers/module-broadcom-wl/files/patch/gcc.patch deleted file mode 100644 index d67cd3d1..00000000 --- a/kernel/drivers/module-broadcom-wl/files/patch/gcc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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` \ No newline at end of file diff --git a/kernel/drivers/module-broadcom-wl/files/patch/linux-40.patch b/kernel/drivers/module-broadcom-wl/files/patch/linux-40.patch deleted file mode 100644 index 7f7d327f..00000000 --- a/kernel/drivers/module-broadcom-wl/files/patch/linux-40.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/wl/sys/wl_cfg80211_hybrid.c 2015-03-16 14:39:29.899350026 +0100 -+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2015-03-16 14:39:06.732682365 +0100 -@@ -1452,7 +1452,11 @@ - WL_DBG(("Could not get rate (%d)\n", err)); - } else { - rate = dtoh32(rate); -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) -+ sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); -+ #else - sinfo->filled |= STATION_INFO_TX_BITRATE; -+ #endif - sinfo->txrate.legacy = rate * 5; - WL_DBG(("Rate %d Mbps\n", (rate / 2))); - } -@@ -1465,7 +1469,11 @@ - return err; - } - rssi = dtoh32(scb_val.val); -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) -+ sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); -+ #else - sinfo->filled |= STATION_INFO_SIGNAL; -+ #endif - sinfo->signal = rssi; - WL_DBG(("RSSI %d dBm\n", rssi)); - } diff --git a/kernel/drivers/module-broadcom-wl/files/patch/linux-recent.patch b/kernel/drivers/module-broadcom-wl/files/patch/linux-recent.patch deleted file mode 100644 index 29f7860b..00000000 --- a/kernel/drivers/module-broadcom-wl/files/patch/linux-recent.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/src/wl/sys/wl_cfg80211_hybrid.c 2014-06-26 12:42:08.000000000 +0200 -+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2014-10-08 18:47:07.549476082 +0200 -@@ -2071,7 +2071,22 @@ - wl_get_assoc_ies(wl); - memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); - wl_update_bss_info(wl); -- cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL); -+ { -+ struct wl_bss_info *bi; -+ u16 bss_info_channel; -+ struct ieee80211_channel *channel; -+ u32 freq; -+ -+ bi = (struct wl_bss_info *)(wl->extra_buf + 4); -+ bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec); -+ -+ freq = ieee80211_channel_to_frequency(bss_info_channel, -+ (bss_info_channel <= CH_MAX_2G_CHANNEL) ? -+ IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ); -+ -+ channel = ieee80211_get_channel(wl_to_wiphy(wl), freq); -+ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL); -+ } - set_bit(WL_STATUS_CONNECTED, &wl->status); - wl->profile->active = true; - } ---- a/src/wl/sys/wl_linux.c 2014-06-26 12:42:08.000000000 +0200 -+++ b/src/wl/sys/wl_linux.c 2014-10-08 18:47:19.526693719 +0200 -@@ -878,7 +878,7 @@ - static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume); - #endif - --static struct pci_driver wl_pci_driver = { -+static struct pci_driver wl_pci_driver __refdata = { - .name = "wl", - .probe = wl_pci_probe, - .remove = __devexit_p(wl_remove), -@@ -1307,7 +1307,12 @@ - dev->priv = priv_link; - #else - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) - dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup); -+#else -+ dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, -+ ether_setup); -+#endif - if (!dev) { - WL_ERROR(("wl%d: %s: alloc_netdev failed\n", - (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__)); ---- a/src/wl/sys/wl_cfg80211_hybrid.c 2014-12-10 03:43:11.145810000 +0000 -+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2014-12-10 03:44:37.700680960 +0000 -@@ -2010,7 +2010,7 @@ - - notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); - notify_ielen = le32_to_cpu(bi->ie_length); -- cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), -+ 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); \ No newline at end of file diff --git a/kernel/drivers/module-broadcom-wl/files/patch/linux47.patch b/kernel/drivers/module-broadcom-wl/files/patch/linux47.patch new file mode 100644 index 00000000..566680a0 --- /dev/null +++ b/kernel/drivers/module-broadcom-wl/files/patch/linux47.patch @@ -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; diff --git a/kernel/drivers/module-broadcom-wl/files/patch/wlan.patch b/kernel/drivers/module-broadcom-wl/files/patch/wlan.patch deleted file mode 100644 index 4e1e50df..00000000 --- a/kernel/drivers/module-broadcom-wl/files/patch/wlan.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c ---- a/src/wl/sys/wl_linux.c 2013-08-01 09:52:22.000000000 +0300 -+++ b/src/wl/sys/wl_linux.c 2013-09-27 09:20:11.495023471 +0300 -@@ -235,7 +235,7 @@ - #define to_str(s) #s - #define quote_str(s) to_str(s) - --#define BRCM_WLAN_IFNAME eth%d -+#define BRCM_WLAN_IFNAME wlan%d - - static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); diff --git a/kernel/drivers/module-broadcom-wl/pspec.xml b/kernel/drivers/module-broadcom-wl/pspec.xml index dd167593..eca7ad8c 100644 --- a/kernel/drivers/module-broadcom-wl/pspec.xml +++ b/kernel/drivers/module-broadcom-wl/pspec.xml @@ -5,8 +5,8 @@ module-broadcom-wl http://www.broadcom.com/support/802.11/linux_sta.php - Serdar Soytetir - kaptan@pisilinux.org + PisiLinux Community + admin@pisilinux.org freedist driver @@ -15,30 +15,21 @@ http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz - kernel-module-headers + kernel-module-headers - - patch/license.patch patch/wl_linux.c.patch - patch/gcc.patch - patch/wlan.patch - - - + patch/linux47.patch module-broadcom-wl - kernel + kernel module-broadcom-wl-userspace - - broadcom-wl - /lib/modules @@ -66,7 +57,7 @@ - 2016-06-28 + 2016-07-27 6.30.223.271 Rebuild for new kernel. PisiLinux Community From 1f1e404132557e68f8e0e0aead97309be3ed3541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erg=C3=BCn=20Salman?= Date: Sat, 30 Jul 2016 11:52:45 +0300 Subject: [PATCH 05/11] Remove grub custom settings --- system/boot/grub2/pspec.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/system/boot/grub2/pspec.xml b/system/boot/grub2/pspec.xml index 3ad78a27..1e9f873b 100644 --- a/system/boot/grub2/pspec.xml +++ b/system/boot/grub2/pspec.xml @@ -73,13 +73,19 @@ pisi-grub-bg.png grub-defaults - 42_custom update-grub - + + 2016-07-30 + 2.02_beta2 + Add windows 42_custom remove + PisiLinux Community + admin@pisilinux.org + + 2016-07-12 2.02_beta2 Add windows 42_custom From 471d30ddeed1fdcbdbbb3a6cd280c2ee4e54f3e6 Mon Sep 17 00:00:00 2001 From: aydemir Date: Tue, 2 Aug 2016 18:26:52 +0300 Subject: [PATCH 06/11] kde5.py add parameters --- system/base/pisi/files/kde5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/base/pisi/files/kde5.py b/system/base/pisi/files/kde5.py index 98a1219a..b1b3d92b 100644 --- a/system/base/pisi/files/kde5.py +++ b/system/base/pisi/files/kde5.py @@ -54,7 +54,7 @@ def configure(parameters = '', installPrefix = prefix, sourceDir = '..'): -DBUILD_TESTING=OFF \ -DKDE_INSTALL_LIBDIR=lib \ -Wno-dev \ - -DCMAKE_INSTALL_PREFIX=%s" % (libexecdir, qmldir, sysconfdir, plugindir, moduledir, prefix), installPrefix, sourceDir) + -DCMAKE_INSTALL_PREFIX=%s" % (libexecdir, qmldir, sysconfdir, plugindir, moduledir, parameters, prefix), installPrefix, sourceDir) shelltools.cd("..") From 5d31db1ff5bc1237ca7001ce07c31fb61f56fdc2 Mon Sep 17 00:00:00 2001 From: aydemir Date: Tue, 2 Aug 2016 18:28:00 +0300 Subject: [PATCH 07/11] pisi kde5 add parameters --- system/base/pisi/pspec.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml index 2c4f9425..1d62c532 100644 --- a/system/base/pisi/pspec.xml +++ b/system/base/pisi/pspec.xml @@ -88,7 +88,7 @@ - 2016-07-24 + 2016-08-02 2.6 Release Bump PisiLinux Community @@ -116,4 +116,4 @@ ertugrulerata@gmail.com - \ No newline at end of file + From e0b00d9de1ff2e2cb2790146986a080dfa9ceb47 Mon Sep 17 00:00:00 2001 From: yusuf Date: Wed, 3 Aug 2016 03:12:45 +0300 Subject: [PATCH 08/11] Update kde5.py --- system/base/pisi/files/kde5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/base/pisi/files/kde5.py b/system/base/pisi/files/kde5.py index b1b3d92b..377515e5 100644 --- a/system/base/pisi/files/kde5.py +++ b/system/base/pisi/files/kde5.py @@ -54,7 +54,7 @@ def configure(parameters = '', installPrefix = prefix, sourceDir = '..'): -DBUILD_TESTING=OFF \ -DKDE_INSTALL_LIBDIR=lib \ -Wno-dev \ - -DCMAKE_INSTALL_PREFIX=%s" % (libexecdir, qmldir, sysconfdir, plugindir, moduledir, parameters, prefix), installPrefix, sourceDir) + -DCMAKE_INSTALL_PREFIX=%s %s" % (libexecdir, qmldir, sysconfdir, plugindir, moduledir, prefix, parameters), installPrefix, sourceDir) shelltools.cd("..") From 83f7150c9e0c938ff6f9dcf592f4c945bb60543f Mon Sep 17 00:00:00 2001 From: yusuf Date: Wed, 3 Aug 2016 05:44:51 +0300 Subject: [PATCH 09/11] update kde5.py --- system/base/pisi/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml index 1d62c532..f1c58e83 100644 --- a/system/base/pisi/pspec.xml +++ b/system/base/pisi/pspec.xml @@ -88,7 +88,7 @@ - 2016-08-02 + 2016-08-03 2.6 Release Bump PisiLinux Community From 79509b5dcc742bddfdc09c24d4874f5b949b86f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Wed, 3 Aug 2016 13:12:19 +0300 Subject: [PATCH 10/11] fix parameters --- system/base/pisi/files/kde5.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/base/pisi/files/kde5.py b/system/base/pisi/files/kde5.py index b1b3d92b..0cd9e41c 100644 --- a/system/base/pisi/files/kde5.py +++ b/system/base/pisi/files/kde5.py @@ -54,7 +54,8 @@ def configure(parameters = '', installPrefix = prefix, sourceDir = '..'): -DBUILD_TESTING=OFF \ -DKDE_INSTALL_LIBDIR=lib \ -Wno-dev \ - -DCMAKE_INSTALL_PREFIX=%s" % (libexecdir, qmldir, sysconfdir, plugindir, moduledir, parameters, prefix), installPrefix, sourceDir) + -DCMAKE_INSTALL_PREFIX=%s \ + %s " % (libexecdir, qmldir, sysconfdir, plugindir, moduledir, prefix, parameters), installPrefix, sourceDir) shelltools.cd("..") From 0addcec99ea34049f99d19df92e61c8fc40faf47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Wed, 3 Aug 2016 13:12:59 +0300 Subject: [PATCH 11/11] Update pspec.xml --- system/base/pisi/pspec.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml index 1d62c532..08b4672b 100644 --- a/system/base/pisi/pspec.xml +++ b/system/base/pisi/pspec.xml @@ -88,9 +88,9 @@ - 2016-08-02 + 2016-08-03 2.6 - Release Bump + add parameters PisiLinux Community admin@pisilinux.org