Changeset 7486 for pkg/raul/main/ndiswrapper/trunk

Timestamp:

03/08/11 05:10:09 (2 years ago)

Author:

alanbach-guest

Message:

• Replaced 2.6.37-build.patch with a working one
  • Dropped linux-2.6.35, not needed anymore

Location:

pkg/raul/main/ndiswrapper/trunk/debian

Files:

• changelog (modified) (1 diff)
• patches/2.6.37-build.patch (modified) (1 diff)
• patches/linux-2.6.35 (deleted)
• patches/series (modified) (1 diff)

pkg/raul/main/ndiswrapper/trunk/debian/changelog

@@ +1 @@
+ndiswrapper (1.56-parsix3) unstable; urgency=low
+
+  * Replaced 2.6.37-build.patch with a working one
+  * Dropped linux-2.6.35, not needed anymore
+
+ -- Alan Baghumian <alan@technotux.org>  Mon, 07 Mar 2011 20:09:38 -0800
+
 ndiswrapper (1.56-parsix3) unstable; urgency=low
 

pkg/raul/main/ndiswrapper/trunk/debian/patches/2.6.37-build.patch

@@ -1 @@
---- ndiswrapper-1.56.old/driver/wrapndis.c   (revision 2728)
-+++ ndiswrapper-1.56/driver/wrapndis.c   (revision 2729)
-@@ -13,16 +13,16 @@
-  *
-  */
-
-+#include <linux/inetdevice.h>
-+#include <linux/ip.h>
-+#include <linux/tcp.h>
-+#include <linux/udp.h>
-+#include <linux/in.h>
- #include "ndis.h"
- #include "iw_ndis.h"
- #include "pnp.h"
- #include "loader.h"
- #include "wrapndis.h"
--#include <linux/inetdevice.h>
--#include <linux/ip.h>
--#include <linux/tcp.h>
--#include <linux/udp.h>
--#include <linux/in.h>
- #include "wrapper.h"
-
-
+diff -urN ndiswrapper-1.56//driver/loader.c ndiswrapper-1.56.new//driver/loader.c
+--- ndiswrapper-1.56//driver/loader.c   2010-02-10 18:09:32.000000000 -0800
++++ ndiswrapper-1.56.new//driver/loader.c       2011-03-07 19:36:42.036829017 -0800
+@@ -21,6 +21,7 @@
+ #include <linux/module.h>
+ #include <linux/kmod.h>
+ #include <linux/miscdevice.h>
++#include <linux/smp_lock.h>
+ #include <asm/uaccess.h>
+ 
+ /*
+@@ -750,7 +751,7 @@
+ }
+ 
+ /* called with loader_mutex is down */
+-static int wrapper_ioctl(struct inode *inode, struct file *file,
++static long wrapper_ioctl(struct file *file,
+                         unsigned int cmd, unsigned long arg)
+ {
+        struct load_driver *load_driver;
+@@ -759,6 +760,7 @@
+        int ret;
+        void __user *addr = (void __user *)arg;
+ 
++        lock_kernel();
+        ENTER1("cmd: %u", cmd);
+ 
+        ret = 0;
+@@ -820,6 +822,7 @@
+                break;
+        }
+        complete(&loader_complete);
++        unlock_kernel();
+        EXIT1(return ret);
+ }
+ 
+@@ -831,7 +834,7 @@
+ 
+ static struct file_operations wrapper_fops = {
+        .owner          = THIS_MODULE,
+-       .ioctl          = wrapper_ioctl,
++       .unlocked_ioctl         = wrapper_ioctl,
+        .release        = wrapper_ioctl_release,
+ };
+ 
+diff -urN ndiswrapper-1.56//driver/ntoskernel.h ndiswrapper-1.56.new//driver/ntoskernel.h
+--- ndiswrapper-1.56//driver/ntoskernel.h       2010-02-10 18:09:32.000000000 -0800
++++ ndiswrapper-1.56.new//driver/ntoskernel.h   2011-03-07 19:37:01.093829002 -0800
+@@ -324,6 +324,12 @@
+        kmem_cache_create(name, size, align, flags, NULL)
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
++#define netdev_mc_count(dev) ((dev)->mc_count)
++#define usb_alloc_coherent(dev, size, mem_flags, dma) (usb_buffer_alloc((dev), (size), (mem_flags), (dma)))
++#define usb_free_coherent(dev, size, addr, dma) (usb_buffer_free((dev), (size), (addr), (dma)))
++#endif
++
+ #include "winnt_types.h"
+ #include "ndiswrapper.h"
+ #include "pe_linker.h"
+diff -urN ndiswrapper-1.56//driver/usb.c ndiswrapper-1.56.new//driver/usb.c
+--- ndiswrapper-1.56//driver/usb.c      2010-02-10 18:09:32.000000000 -0800
++++ ndiswrapper-1.56.new//driver/usb.c  2011-03-07 19:37:01.057829281 -0800
+@@ -191,7 +191,7 @@
+        if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) {
+                USBTRACE("freeing DMA buffer for URB: %p %p",
+                         urb, urb->transfer_buffer);
+-               usb_buffer_free(IRP_WRAP_DEVICE(irp)->usb.udev,
++               usb_free_coherent(IRP_WRAP_DEVICE(irp)->usb.udev,
+                                urb->transfer_buffer_length,
+                                urb->transfer_buffer, urb->transfer_dma);
+        }
+@@ -304,7 +304,7 @@
+ #endif
+                    )) {
+                urb->transfer_buffer =
+-                       usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags,
++                       usb_alloc_coherent(wd->usb.udev, buf_len, alloc_flags,
+                                         &urb->transfer_dma);
+                if (!urb->transfer_buffer) {
+                        WARNING("couldn't allocate dma buf");
+diff -urN ndiswrapper-1.56//driver/wrapndis.c ndiswrapper-1.56.new//driver/wrapndis.c
+--- ndiswrapper-1.56//driver/wrapndis.c 2010-02-10 18:09:32.000000000 -0800
++++ ndiswrapper-1.56.new//driver/wrapndis.c     2011-03-07 19:37:01.056829286 -0800
+@@ -950,20 +950,34 @@
+                packet_filter |= NDIS_PACKET_TYPE_PROMISCUOUS |
+                        NDIS_PACKET_TYPE_ALL_LOCAL;
+        } else if (net_dev->flags & IFF_ALLMULTI ||
+-                  net_dev->mc_count > wnd->multicast_size) {
++                  netdev_mc_count(net_dev) > wnd->multicast_size) {
+                packet_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
+                TRACE2("0x%08x", packet_filter);
+-       } else if (net_dev->mc_count > 0) {
++       } else if (netdev_mc_count(net_dev) > 0) {
+                int i, size;
+                char *buf;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
++               struct netdev_hw_addr *ha;
++#else
+                struct dev_mc_list *mclist;
+-               size = min(wnd->multicast_size, net_dev->mc_count);
+-               TRACE2("%d, %d", wnd->multicast_size, net_dev->mc_count);
++#endif
++               size = min(wnd->multicast_size, netdev_mc_count(net_dev));
++               TRACE2("%d, %d", wnd->multicast_size, netdev_mc_count(net_dev));
+                buf = kmalloc(size * ETH_ALEN, GFP_KERNEL);
+                if (!buf) {
+                        WARNING("couldn't allocate memory");
+                        EXIT2(return);
+                }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
++               i = 0;
++               netdev_for_each_mc_addr(ha, net_dev) {
++                       if (i >= size)
++                               break;
++                       memcpy(buf + i * ETH_ALEN, ha->addr, ETH_ALEN);
++                       TRACE2(MACSTRSEP, MAC2STR(ha->addr));
++                       i++;
++               }
++#else
+                mclist = net_dev->mc_list;
+                for (i = 0; i < size && mclist; mclist = mclist->next) {
+                        if (mclist->dmi_addrlen != ETH_ALEN)
+@@ -972,6 +986,7 @@
+                        TRACE2(MACSTRSEP, MAC2STR(mclist->dmi_addr));
+                        i++;
+                }
++#endif
+                res = mp_set(wnd, OID_802_3_MULTICAST_LIST, buf, i * ETH_ALEN);
+                if (res == NDIS_STATUS_SUCCESS && i > 0)
+                        packet_filter |= NDIS_PACKET_TYPE_MULTICAST;
+diff -urN ndiswrapper-1.56//utils/loadndisdriver.c ndiswrapper-1.56.new//utils/loadndisdriver.c
+--- ndiswrapper-1.56//utils/loadndisdriver.c    2010-02-10 18:09:32.000000000 -0800
++++ ndiswrapper-1.56.new//utils/loadndisdriver.c        2011-03-07 19:36:42.035829012 -0800
+@@ -505,7 +505,7 @@
+ 
+ int main(int argc, char *argv[0])
+ {
+-       int i, ioctl_device, res;
++       int i, ioctl_device=-1, res;
+        char *cmd;
+ 
+        openlog(PROG_NAME, LOG_PERROR | LOG_CONS, LOG_KERN | LOG_DEBUG);
+diff -urN ndiswrapper-1.56//utils/Makefile ndiswrapper-1.56.new//utils/Makefile
+--- ndiswrapper-1.56//utils/Makefile    2010-02-10 18:09:32.000000000 -0800
++++ ndiswrapper-1.56.new//utils/Makefile        2011-03-07 19:36:42.034828983 -0800
+@@ -5,7 +5,7 @@
+ DRIVER_DIR ?= ../driver
+ 
+ CC = gcc
+-CFLAGS = -g -Wall -I$(DRIVER_DIR)
++CFLAGS += -I$(DRIVER_DIR)
+ 
+ DISTFILES=Makefile ndiswrapper loadndisdriver.c ndiswrapper-buginfo
+ 

pkg/raul/main/ndiswrapper/trunk/debian/patches/series

@@ -1 @@
-linux-2.6.35
 2.6.37-build.patch