package r8168-dkms
tags 656734 pending patch upstream
forwarded 656734 http://code.google.com/p/r8168/issues/detail?id=8
thanks

Le samedi 21 janv. 2012 à 12:57:39 (+0100 CET), Julien Valroff a écrit :
> Package: r8168-dkms
> Version: 8.027.00-1
> Severity: important
> 
> Dear Maintainer,
> 
> The r8168 module doesn't build against the 3.2 linux kernel which has
> recently been accepted in the archive.
[...]

Please find attached a patch against git HEAD grabbed from the upstream bug
report.

Cheers,
Julien

-- 
  .''`.   Julien Valroff ~ <jul...@kirya.net> ~ <jul...@debian.org>    
 : :'  :  Debian Developer & Free software contributor
 `. `'`   http://www.kirya.net/
   `-     4096R/ E1D8 5796 8214 4687 E416  948C 859F EF67 258E 26B1
diff --git a/debian/changelog b/debian/changelog
index 17d31bf..5a76e16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+r8168 (8.027.00-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add patch to fix build with linux kernel >= 3.2 (Closes: #656734)
+
+ -- Julien Valroff <jul...@debian.org>  Sat, 21 Jan 2012 13:07:29 +0100
+
 r8168 (8.027.00-1) unstable; urgency=low
 
   * New upstream release 8.027.00 (2011-12-01).
diff --git a/debian/patches/001_build-with-kernel-3.2.x.diff b/debian/patches/001_build-with-kernel-3.2.x.diff
new file mode 100644
index 0000000..9b0e8eb
--- /dev/null
+++ b/debian/patches/001_build-with-kernel-3.2.x.diff
@@ -0,0 +1,15 @@
+Description: fix build with kernel >= 3.2.x
+Bug: http://code.google.com/p/r8168/issues/detail?id=8
+Last-Updated: 2012-01-21
+
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -14282,7 +14282,7 @@
+ 
+ 		txd = tp->TxDescArray + entry;
+ 		len = frag->size;
+-		addr = ((void *) page_address(frag->page)) + frag->page_offset;
++ 		addr = ((void *) page_address(frag->page.p)) + frag->page_offset;
+ 		mapping = pci_map_single(tp->pci_dev, addr, len, PCI_DMA_TODEVICE);
+ 
+ 		/* anti gcc 2.95.3 bugware (sic) */
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6d25d63
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_build-with-kernel-3.2.x.diff

Reply via email to