Bug#597157: marked as done (ipheth-dkms: Module fails to build on >= 2.6.35 kernels)

Debian Bug Tracking System Fri, 24 Sep 2010 09:33:20 -0700

Your message dated Fri, 24 Sep 2010 16:32:13 +0000
with message-id <[email protected]>
and subject line Bug#597157: fixed in ipheth 1.0-2
has caused the Debian Bug report #597157,
regarding ipheth-dkms: Module fails to build on >= 2.6.35 kernels
to be marked as done.


This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
597157: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597157
Debian Bug Tracking System
Contact [email protected] with problems

--- Begin Message ---

Package: ipheth-dkms
Version: 1.0-1
Severity: important

usb_buffer_free/alloc are renamed in 2.6.34 and the compatibility functions
dropped in 2.6.35 causing the module to fail to build on 2.6.35. Attached is a
patch that allows for this.



-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages ipheth-dkms depends on:
ii  dkms                          2.1.1.2-5  Dynamic Kernel Module Support Fram

ipheth-dkms recommends no packages.

ipheth-dkms suggests no packages.

-- no debconf information

Author: Niall Creech <[email protected]>
Description: Rename calls to usb_buffer_free and usb_buffer_alloc to
usb_free_coherent and usb_alloc_coherent for >= 2.6.35 kernels
Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/ipheth/+bug/605740
Index: ipheth-1.0/ipheth-driver/ipheth.c
===================================================================
--- ipheth-1.0.orig/ipheth-driver/ipheth.c	2010-09-17 07:21:58.392165306 +0100
+++ ipheth-1.0/ipheth-driver/ipheth.c	2010-09-17 07:36:04.331050774 +0100
@@ -54,6 +54,14 @@
 #include <asm/uaccess.h>
 #include <linux/usb.h>
 #include <linux/workqueue.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
+#  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
 
 #define USB_VENDOR_APPLE        0x05ac
 #define USB_PRODUCT_IPHETH     0x1290
@@ -120,14 +128,14 @@
 	if (rx_urb == NULL)
 		goto error;
 
-	tx_buf = usb_buffer_alloc(iphone->udev,
+	tx_buf = usb_alloc_coherent(iphone->udev,
 				  IPHETH_BUF_SIZE,
 				  GFP_KERNEL,
 				  &tx_urb->transfer_dma);
 	if (tx_buf == NULL)
 		goto error;
 
-	rx_buf = usb_buffer_alloc(iphone->udev,
+	rx_buf = usb_alloc_coherent(iphone->udev,
 				  IPHETH_BUF_SIZE,
 				  GFP_KERNEL,
 				  &rx_urb->transfer_dma);
@@ -142,9 +150,9 @@
 	return 0;
 
 error:
-	usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, rx_buf,
+	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, rx_buf,
 			rx_urb->transfer_dma);
-	usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, tx_buf,
+	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, tx_buf,
 			tx_urb->transfer_dma);
 	usb_free_urb(rx_urb);
 	usb_free_urb(tx_urb);
@@ -153,9 +161,9 @@
 
 static void ipheth_free_urbs (struct ipheth_device *iphone)
 {
-	usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
+	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
 			iphone->rx_urb->transfer_dma);
-	usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
+	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
 			iphone->tx_urb->transfer_dma);
 	usb_free_urb(iphone->rx_urb);
 	usb_free_urb(iphone->tx_urb);

Author: Niall Creech <[email protected]>
Description: Rename calls to usb_buffer_free and usb_buffer_alloc to
usb_free_coherent and usb_alloc_coherent for >= 2.6.35 kernels
Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/ipheth/+bug/605740
Index: ipheth-1.0/ipheth-driver/ipheth.c
===================================================================
--- ipheth-1.0.orig/ipheth-driver/ipheth.c	2010-09-17 07:21:58.392165306 +0100
+++ ipheth-1.0/ipheth-driver/ipheth.c	2010-09-17 07:36:04.331050774 +0100
@@ -54,6 +54,14 @@
 #include <asm/uaccess.h>
 #include <linux/usb.h>
 #include <linux/workqueue.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
+#  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
 
 #define USB_VENDOR_APPLE        0x05ac
 #define USB_PRODUCT_IPHETH     0x1290
@@ -120,14 +128,14 @@
 	if (rx_urb == NULL)
 		goto error;
 
-	tx_buf = usb_buffer_alloc(iphone->udev,
+	tx_buf = usb_alloc_coherent(iphone->udev,
 				  IPHETH_BUF_SIZE,
 				  GFP_KERNEL,
 				  &tx_urb->transfer_dma);
 	if (tx_buf == NULL)
 		goto error;
 
-	rx_buf = usb_buffer_alloc(iphone->udev,
+	rx_buf = usb_alloc_coherent(iphone->udev,
 				  IPHETH_BUF_SIZE,
 				  GFP_KERNEL,
 				  &rx_urb->transfer_dma);
@@ -142,9 +150,9 @@
 	return 0;
 
 error:
-	usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, rx_buf,
+	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, rx_buf,
 			rx_urb->transfer_dma);
-	usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, tx_buf,
+	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, tx_buf,
 			tx_urb->transfer_dma);
 	usb_free_urb(rx_urb);
 	usb_free_urb(tx_urb);
@@ -153,9 +161,9 @@
 
 static void ipheth_free_urbs (struct ipheth_device *iphone)
 {
-	usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
+	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
 			iphone->rx_urb->transfer_dma);
-	usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
+	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
 			iphone->tx_urb->transfer_dma);
 	usb_free_urb(iphone->rx_urb);
 	usb_free_urb(iphone->tx_urb);

--- End Message ---

--- Begin Message ---

Source: ipheth
Source-Version: 1.0-2

We believe that the bug you reported is fixed in the latest version of
ipheth, which is due to be installed in the Debian FTP archive:

ipheth-utils_1.0-2_amd64.deb
  to main/i/ipheth/ipheth-utils_1.0-2_amd64.deb
ipheth_1.0-2.debian.tar.gz
  to main/i/ipheth/ipheth_1.0-2.debian.tar.gz
ipheth_1.0-2.dsc
  to main/i/ipheth/ipheth_1.0-2.dsc



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Paul McEnery <[email protected]> (supplier of updated ipheth package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Thu, 23 Sep 2010 15:01:13 +0100
Source: ipheth
Binary: ipheth-utils
Architecture: source amd64
Version: 1.0-2
Distribution: unstable
Urgency: low
Maintainer: Paul McEnery <[email protected]>
Changed-By: Paul McEnery <[email protected]>
Description: 
 ipheth-utils - USB tethering driver support utilities for the iPhone
Closes: 597157
Changes: 
 ipheth (1.0-2) unstable; urgency=low
 .
   * Removed the ipheth-dkms package (Closes: #597157)
Checksums-Sha1: 
 b15fdc4edd8a63c7334184591d0d63357b049e88 1136 ipheth_1.0-2.dsc
 70abcda2826d04871672a45e0cb0f38977c3012e 3323 ipheth_1.0-2.debian.tar.gz
 353f8a2ac12d6c009d335aa520b1a56c92f728d8 7292 ipheth-utils_1.0-2_amd64.deb
Checksums-Sha256: 
 65ab1671640c96cffddaa25784b360f70c6109e0872db27526e137054b34c85d 1136 
ipheth_1.0-2.dsc
 6b22a8eacc049a0684084a3a121746c244c487ad4885af9498b69fe3c9cb33c8 3323 
ipheth_1.0-2.debian.tar.gz
 86db27db3d9a5f8b4111fb67db02036479a64c4690c32af7adfd84fd5934ec6e 7292 
ipheth-utils_1.0-2_amd64.deb
Files: 
 6d59c9a34e6f6d93fcc5d25360d50d05 1136 net extra ipheth_1.0-2.dsc
 eba17f73c07d0604faf5622c9db70ebf 3323 net extra ipheth_1.0-2.debian.tar.gz
 f262250cc4a7afb3bfcfbf8b992c6fa2 7292 net extra ipheth-utils_1.0-2_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iD8DBQFMnM/ezWFP1/XWUWkRAhQJAJoC+Y948SKHfJkbxK1qAYENOejLiwCgpIjZ
hi2vrN11QXVfvlfOnEpLE7k=
=oZIl
-----END PGP SIGNATURE-----

--- End Message ---

Bug#597157: marked as done (ipheth-dkms: Module fails to build on >= 2.6.35 kernels)

Reply via email to