Hello community, here is the log from the commit of package ndiswrapper for openSUSE:Factory checked in at 2013-09-26 14:45:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ndiswrapper (Old) and /work/SRC/openSUSE:Factory/.ndiswrapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ndiswrapper" Changes: -------- --- /work/SRC/openSUSE:Factory/ndiswrapper/ndiswrapper.changes 2013-05-27 09:54:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ndiswrapper.new/ndiswrapper.changes 2013-09-26 14:45:06.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 24 08:31:28 UTC 2013 - [email protected] + +- Update to version 1.58 +- Refresh ndiswrapper-1.58-kernel-3.9.patch +- Add ndiswrapper-1.58-kernel-3.10.patch to fix compilation with + kernel 3.10 + +------------------------------------------------------------------- Old: ---- ndiswrapper-1.58rc1.tar.gz New: ---- ndiswrapper-1.58-kernel-3.10.patch ndiswrapper-1.58.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndiswrapper.spec ++++++ --- /var/tmp/diff_new_pack.WJQa18/_old 2013-09-26 14:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.WJQa18/_new 2013-09-26 14:45:07.000000000 +0200 @@ -17,18 +17,18 @@ Name: ndiswrapper -Version: 1.57.99 +Version: 1.58 Release: 0 -%define real_version 1.58rc1 Summary: Use Microsoft NDIS Network Drivers for WLAN Cards License: GPL-2.0+ Group: System/Kernel Url: http://ndiswrapper.sourceforge.net -Source0: http://downloads.sourceforge.net/project/ndiswrapper/testing/%{name}-%{real_version}.tar.gz +Source0: http://downloads.sourceforge.net/project/ndiswrapper/stable/ndiswrapper-%{version}.tar.gz Source2: README.SUSE Source3: preamble Patch1: ndiswrapper.diff Patch2: ndiswrapper-1.58-kernel-3.9.patch +Patch3: ndiswrapper-1.58-kernel-3.10.patch BuildRequires: kernel-source BuildRequires: kernel-syms BuildRequires: module-init-tools @@ -57,9 +57,10 @@ NDIS (Windows network driver API) drivers. %prep -%setup -q -n %{name}-%{real_version} +%setup -q %patch1 -%patch2 +%patch2 -p1 +%patch3 -p1 cp %{SOURCE2} . mkdir obj @@ -78,9 +79,11 @@ %install install -d -m 755 %{buildroot}/sbin %{buildroot}%{_sbindir} \ %{buildroot}%{_sysconfdir}/ndiswrapper + # Userspace stuff install -m 755 utils/loadndisdriver %{buildroot}/sbin install -m 755 utils/ndiswrapper %{buildroot}%{_prefix}/sbin + # Kernel module export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=updates ++++++ ndiswrapper-1.58-kernel-3.10.patch ++++++ ++++ 626 lines (skipped) ++++++ ndiswrapper-1.58-kernel-3.9.patch ++++++ --- /var/tmp/diff_new_pack.WJQa18/_old 2013-09-26 14:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.WJQa18/_new 2013-09-26 14:45:07.000000000 +0200 @@ -1,66 +1,41 @@ -Index: driver/loader.c +Description: Support kernel 3.9 + The add_taint() function receives two arguments in 3.9 +Index: ndiswrapper-1.58/driver/loader.c =================================================================== ---- driver/loader.c.orig -+++ driver/loader.c -@@ -23,6 +23,10 @@ - #include <linux/miscdevice.h> - #include <asm/uaccess.h> - -+#ifndef __devexit_p -+#define __devexit_p(A) A -+#endif -+ - /* - Network adapter: ClassGuid = {4d36e972-e325-11ce-bfc1-08002be10318} - Network client: ClassGuid = {4d36e973-e325-11ce-bfc1-08002be10318} -@@ -575,7 +579,11 @@ static int load_user_space_driver(struct +--- ndiswrapper-1.58.orig/driver/loader.c ++++ ndiswrapper-1.58/driver/loader.c +@@ -575,7 +575,11 @@ static int load_user_space_driver(struct } else { printk(KERN_INFO "%s: driver %s (%s) loaded\n", DRIVER_NAME, wrap_driver->name, wrap_driver->version); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) -+ add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_NOW_UNRELIABLE); -+#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0) add_taint(TAINT_PROPRIETARY_MODULE); ++#else ++ add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_NOW_UNRELIABLE); +#endif EXIT1(return 0); } } -Index: driver/wrapper.c +Index: ndiswrapper-1.58/driver/wrapper.c =================================================================== ---- driver/wrapper.c.orig -+++ driver/wrapper.c +--- ndiswrapper-1.58.orig/driver/wrapper.c ++++ ndiswrapper-1.58/driver/wrapper.c @@ -72,7 +72,11 @@ static void module_cleanup(void) static int __init wrapper_init(void) { #ifdef TAINT_OOT_MODULE -- add_taint(TAINT_OOT_MODULE); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) -+ add_taint(TAINT_OOT_MODULE, LOCKDEP_NOW_UNRELIABLE); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0) + add_taint(TAINT_OOT_MODULE); +#else -+ add_taint(TAINT_OOT_MODULE); ++ add_taint(TAINT_OOT_MODULE, LOCKDEP_NOW_UNRELIABLE); +#endif #endif printk(KERN_INFO "%s version %s loaded (smp=%s, preempt=%s)\n", DRIVER_NAME, DRIVER_VERSION, -Index: driver/pnp.h -=================================================================== ---- driver/pnp.h.orig -+++ driver/pnp.h -@@ -20,6 +20,10 @@ - #include "ndis.h" - #include "wrapndis.h" - -+#ifndef __devexit -+#define __devexit -+#endif -+ - int wrap_pnp_start_pci_device(struct pci_dev *pdev, - const struct pci_device_id *ent); - void __devexit wrap_pnp_remove_pci_device(struct pci_dev *pdev); -Index: driver/workqueue.c +Index: ndiswrapper-1.58/driver/workqueue.c =================================================================== ---- driver/workqueue.c.orig -+++ driver/workqueue.c +--- ndiswrapper-1.58.orig/driver/workqueue.c ++++ ndiswrapper-1.58/driver/workqueue.c @@ -53,7 +53,6 @@ static int workq_thread(void *data) WORKTRACE("%p, %d, %p", workq, thread_data->index, thread); strncpy(thread->name, current->comm, sizeof(thread->name)); ++++++ ndiswrapper-1.58rc1.tar.gz -> ndiswrapper-1.58.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.58rc1/ChangeLog new/ndiswrapper-1.58/ChangeLog --- old/ndiswrapper-1.58rc1/ChangeLog 2012-05-01 06:54:20.000000000 +0200 +++ new/ndiswrapper-1.58/ChangeLog 2013-02-19 19:00:37.000000000 +0100 @@ -1,3 +1,7 @@ +Version 1.58 2013-02-19 +======================= +* Added support for Linux kernels up to 3.8 + Version 1.57 2011-12-31 ======================= * Added support for Linux 2.6.35 - Linux 3.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.58rc1/driver/Makefile new/ndiswrapper-1.58/driver/Makefile --- old/ndiswrapper-1.58rc1/driver/Makefile 2012-05-01 06:54:20.000000000 +0200 +++ new/ndiswrapper-1.58/driver/Makefile 2013-02-19 19:00:37.000000000 +0100 @@ -12,15 +12,20 @@ # By default, we try to compile the modules for the currently running # kernel. But it's the first approximation, as we will re-read the # version from the kernel sources. -KVERS ?= $(shell uname -r) +KVERS_UNAME ?= $(shell uname -r) # KBUILD is the path to the Linux kernel build tree. It is usually the # same as the kernel source tree, except when the kernel was compiled in # a separate directory. -KBUILD := $(shell readlink -f /lib/modules/$(KVERS)/build) +KBUILD ?= $(shell readlink -f /lib/modules/$(KVERS_UNAME)/build) ifeq (,$(KBUILD)) -$(error Kernel tree not found - please set KBUILD to configured kernel) +$(error Kernel build tree not found - please set KBUILD to configured kernel) +endif + +KCONFIG := $(KBUILD)/.config +ifeq (,$(wildcard $(KCONFIG))) +$(error No .config found in $(KBUILD), please set KBUILD to configured kernel) endif # Kernel Makefile doesn't always know the exact kernel version, so we @@ -33,24 +38,20 @@ VERSION_H := $(KBUILD)/include/linux/version.h endif ifeq (,$(wildcard $(VERSION_H))) -$(error Cannot find kernel version in $(KBUILD), is it configured?) +$(error Please run 'make modules_prepare' in $(KBUILD)) endif KVERS := $(shell sed -ne 's/"//g;s/^\#define UTS_RELEASE //p' $(VERSION_H)) ifeq (,$(KVERS)) -$(error Cannot find UTS_RELEASE in $(VERSION_H), has 'make modules_prepare' been called?) +$(error Cannot find UTS_RELEASE in $(VERSION_H), please report) endif INST_DIR = /lib/modules/$(KVERS)/misc SRC_DIR=$(shell pwd) -KCONFIG := $(KBUILD)/.config -ifeq (,$(wildcard $(KCONFIG))) -$(error No .config found in $(KBUILD), please set KBUILD to configured kernel) -endif -include $(KBUILD)/.config +include $(KCONFIG) # returns of structs and unions in registers when possible, like Windows EXTRA_CFLAGS += -freg-struct-return @@ -157,14 +158,6 @@ config_check: - @if [ ! -f $(KBUILD)/include/linux/version.h ]; then \ - echo; echo; \ - echo "Cannot find kernel build files in $(KBUILD)"; \ - echo "Please give the path to kernel build directory with" ; \ - echo "the KBUILD=<path> argument to make";\ - echo; echo; \ - exit 1; \ - fi @if [ -z "$(CONFIG_WIRELESS_EXT)$(CONFIG_NET_RADIO)" ]; then \ echo; echo; \ echo "*** WARNING: This kernel lacks wireless extensions."; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.58rc1/driver/iw_ndis.c new/ndiswrapper-1.58/driver/iw_ndis.c --- old/ndiswrapper-1.58rc1/driver/iw_ndis.c 2012-05-01 06:54:20.000000000 +0200 +++ new/ndiswrapper-1.58/driver/iw_ndis.c 2013-02-19 19:00:37.000000000 +0100 @@ -13,7 +13,6 @@ * */ -#include <linux/version.h> #include <linux/wireless.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.58rc1/driver/loader.c new/ndiswrapper-1.58/driver/loader.c --- old/ndiswrapper-1.58rc1/driver/loader.c 2012-05-01 06:54:20.000000000 +0200 +++ new/ndiswrapper-1.58/driver/loader.c 2013-02-19 19:00:37.000000000 +0100 @@ -596,7 +596,7 @@ .name = DRIVER_NAME, .id_table = wrap_pci_id_table, .probe = wrap_pnp_start_pci_device, - .remove = __devexit_p(wrap_pnp_remove_pci_device), + .remove = wrap_pnp_remove_pci_device, .suspend = wrap_pnp_suspend_pci_device, .resume = wrap_pnp_resume_pci_device, }; @@ -612,7 +612,7 @@ .name = DRIVER_NAME, .id_table = wrap_usb_id_table, .probe = wrap_pnp_start_usb_device, - .disconnect = __devexit_p(wrap_pnp_remove_usb_device), + .disconnect = wrap_pnp_remove_usb_device, .suspend = wrap_pnp_suspend_usb_device, .resume = wrap_pnp_resume_usb_device, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.58rc1/driver/ndiswrapper.h new/ndiswrapper-1.58/driver/ndiswrapper.h --- old/ndiswrapper-1.58rc1/driver/ndiswrapper.h 2012-05-01 06:54:20.000000000 +0200 +++ new/ndiswrapper-1.58/driver/ndiswrapper.h 2013-02-19 19:00:37.000000000 +0100 @@ -16,7 +16,7 @@ #ifndef _NDISWRAPPER_H_ #define _NDISWRAPPER_H_ -#define DRIVER_VERSION "1.58rc1" +#define DRIVER_VERSION "1.58" #define UTILS_VERSION "1.9" #define DRIVER_NAME "ndiswrapper" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.58rc1/driver/ntoskernel.h new/ndiswrapper-1.58/driver/ntoskernel.h --- old/ndiswrapper-1.58rc1/driver/ntoskernel.h 2012-05-01 06:54:20.000000000 +0200 +++ new/ndiswrapper-1.58/driver/ntoskernel.h 2013-02-19 19:00:37.000000000 +0100 @@ -207,7 +207,9 @@ #else // WRAP_WQ /* Compatibility for Linux before 2.6.20 where INIT_WORK takes 3 arguments */ -#if !defined(INIT_WORK_NAR) && !defined(INIT_DELAYED_WORK_DEFERRABLE) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) && \ + !defined(INIT_WORK_NAR) && \ + !defined(INIT_DELAYED_WORK_DEFERRABLE) typedef void (*compat_work_func_t)(void *work); typedef void (*work_func_t)(struct work_struct *work); static inline void (INIT_WORK)(struct work_struct *work, work_func_t func) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.58rc1/driver/pnp.c new/ndiswrapper-1.58/driver/pnp.c --- old/ndiswrapper-1.58rc1/driver/pnp.c 2012-05-01 06:54:20.000000000 +0200 +++ new/ndiswrapper-1.58/driver/pnp.c 2013-02-19 19:00:37.000000000 +0100 @@ -559,10 +559,6 @@ return 0; } -/* - * This function should not be marked __devinit because PCI IDs are - * added dynamically. - */ int wrap_pnp_start_pci_device(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -660,7 +656,7 @@ return 0; } -void __devexit wrap_pnp_remove_usb_device(struct usb_interface *intf) +void wrap_pnp_remove_usb_device(struct usb_interface *intf) { struct wrap_device *wd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.58rc1/driver/pnp.h new/ndiswrapper-1.58/driver/pnp.h --- old/ndiswrapper-1.58rc1/driver/pnp.h 2012-05-01 06:54:20.000000000 +0200 +++ new/ndiswrapper-1.58/driver/pnp.h 2013-02-19 19:00:37.000000000 +0100 @@ -22,7 +22,7 @@ int wrap_pnp_start_pci_device(struct pci_dev *pdev, const struct pci_device_id *ent); -void __devexit wrap_pnp_remove_pci_device(struct pci_dev *pdev); +void wrap_pnp_remove_pci_device(struct pci_dev *pdev); int wrap_pnp_suspend_pci_device(struct pci_dev *pdev, pm_message_t state); int wrap_pnp_resume_pci_device(struct pci_dev *pdev); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.58rc1/driver/wrapndis.c new/ndiswrapper-1.58/driver/wrapndis.c --- old/ndiswrapper-1.58rc1/driver/wrapndis.c 2012-05-01 06:54:20.000000000 +0200 +++ new/ndiswrapper-1.58/driver/wrapndis.c 2013-02-19 19:00:37.000000000 +0100 @@ -256,12 +256,14 @@ } hangcheck_del(wnd); del_iw_stats_timer(wnd); +#ifdef CONFIG_WIRELESS_EXT if (wnd->physical_medium == NdisPhysicalMediumWirelessLan && wrap_is_pci_bus(wnd->wd->dev_bus)) { mutex_unlock(&wnd->ndis_req_mutex); disassociate(wnd, 0); mutex_lock(&wnd->ndis_req_mutex); } +#endif mp = &wnd->wd->driver->ndis_driver->mp; TRACE1("halt: %p", mp->mp_halt); LIN2WIN1(mp->mp_halt, wnd->nmb->mp_ctx); @@ -1218,6 +1220,7 @@ return status; } +#ifdef CONFIG_WIRELESS_EXT static void get_encryption_capa(struct ndis_device *wnd, char *buf, const int buf_len) { @@ -1356,6 +1359,7 @@ } EXIT1(return); } +#endif wstdcall NTSTATUS NdisDispatchDeviceControl(struct device_object *fdo, struct irp *irp) @@ -1953,6 +1957,7 @@ if (status != NDIS_STATUS_SUCCESS) wnd->physical_medium = NdisPhysicalMediumUnspecified; +#ifdef CONFIG_WIRELESS_EXT if (wnd->physical_medium == NdisPhysicalMediumWirelessLan) { mp_set_int(wnd, OID_802_11_POWER_MODE, NDIS_POWER_OFF); get_encryption_capa(wnd, buf, buf_len); @@ -1978,6 +1983,7 @@ set_default_iw_params(wnd); } +#endif kfree(buf); hangcheck_add(wnd); add_iw_stats_timer(wnd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ndiswrapper-1.58rc1/ndiswrapper.spec new/ndiswrapper-1.58/ndiswrapper.spec --- old/ndiswrapper-1.58rc1/ndiswrapper.spec 2012-05-01 06:54:20.000000000 +0200 +++ new/ndiswrapper-1.58/ndiswrapper.spec 2013-02-19 19:00:37.000000000 +0100 @@ -1,5 +1,5 @@ # Define ndiswrapper_version only if it is not already defined. -%{!?ndiswrapper_version: %define ndiswrapper_version 1.58rc1} +%{!?ndiswrapper_version: %define ndiswrapper_version 1.58} %{!?ndiswrapper_release: %define ndiswrapper_release 1} # Define kernel version if not already defined -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
