[kernel] r11975 - in dists/trunk/linux-2.6/debian/patches: bugfix/arm series

[Martin Michlmayr]

Author: tbm
Date: Wed Aug  6 07:20:39 2008
New Revision: 11975

Log:
should be in rc3 but needed for now


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/ixp4xx_eth-build-fix.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/ixp4xx_eth-build-fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/ixp4xx_eth-build-fix.patch	Wed Aug  6 07:20:39 2008
@@ -0,0 +1,60 @@
+The arm ixp4xx_eth driver doesn't compile in 2.6.27-rc1:
+
+  CC [M]  drivers/net/arm/ixp4xx_eth.o
+drivers/net/arm/ixp4xx_eth.c: In function 'eth_poll':
+drivers/net/arm/ixp4xx_eth.c:554: warning: passing argument 1 of 'dma_mapping_error' makes pointer from integer without a cast
+drivers/net/arm/ixp4xx_eth.c:554: error: too few arguments to function 'dma_mapping_error'
+drivers/net/arm/ixp4xx_eth.c: In function 'eth_xmit':
+drivers/net/arm/ixp4xx_eth.c:701: warning: passing argument 1 of 'dma_mapping_error' makes pointer from integer without a cast
+drivers/net/arm/ixp4xx_eth.c:701: error: too few arguments to function 'dma_mapping_error'
+drivers/net/arm/ixp4xx_eth.c: In function 'init_queues':
+drivers/net/arm/ixp4xx_eth.c:886: warning: passing argument 1 of 'dma_mapping_error' makes pointer from integer without a cast
+drivers/net/arm/ixp4xx_eth.c:886: error: too few arguments to function 'dma_mapping_error'
+make[3]: *** [drivers/net/arm/ixp4xx_eth.o] Error 1
+make[2]: *** [drivers/net/arm] Error 2
+make[1]: *** [drivers/net] Error 2
+make: *** [drivers] Error 2
+
+dma_mapping_error() changed in 2.6.27-rc1 to also take a device parameter,
+but nobody bothered updating ixp4xx_eth.c. Fixed by passing the appropriate
+device value in the dma_mapping_error() calls.
+
+Tested on an ixp425 box.
+
+Signed-off-by: Mikael Pettersson <mikpe at it.uu.se>
+---
+
+diff -rupN linux-2.6.27-rc1/drivers/net/arm/ixp4xx_eth.c linux-2.6.27-rc1.arm-ixp4xx_eth-dma_mapping_error-fix/drivers/net/arm/ixp4xx_eth.c
+--- linux-2.6.27-rc1/drivers/net/arm/ixp4xx_eth.c	2008-07-29 10:40:10.000000000 +0200
++++ linux-2.6.27-rc1.arm-ixp4xx_eth-dma_mapping_error-fix/drivers/net/arm/ixp4xx_eth.c	2008-08-01 19:38:35.000000000 +0200
+@@ -551,7 +551,7 @@ static int eth_poll(struct napi_struct *
+ 		if ((skb = netdev_alloc_skb(dev, RX_BUFF_SIZE))) {
+ 			phys = dma_map_single(&dev->dev, skb->data,
+ 					      RX_BUFF_SIZE, DMA_FROM_DEVICE);
+-			if (dma_mapping_error(phys)) {
++			if (dma_mapping_error(&dev->dev, phys)) {
+ 				dev_kfree_skb(skb);
+ 				skb = NULL;
+ 			}
+@@ -698,7 +698,7 @@ static int eth_xmit(struct sk_buff *skb,
+ #endif
+ 
+ 	phys = dma_map_single(&dev->dev, mem, bytes, DMA_TO_DEVICE);
+-	if (dma_mapping_error(phys)) {
++	if (dma_mapping_error(&dev->dev, phys)) {
+ #ifdef __ARMEB__
+ 		dev_kfree_skb(skb);
+ #else
+@@ -883,7 +883,7 @@ static int init_queues(struct port *port
+ 		desc->buf_len = MAX_MRU;
+ 		desc->data = dma_map_single(&port->netdev->dev, data,
+ 					    RX_BUFF_SIZE, DMA_FROM_DEVICE);
+-		if (dma_mapping_error(desc->data)) {
++		if (dma_mapping_error(&port->netdev->dev, desc->data)) {
+ 			free_buffer(buff);
+ 			return -EIO;
+ 		}
+--
+To unsubscribe from this list: send the line "unsubscribe netdev" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Wed Aug  6 07:20:39 2008
@@ -30,6 +30,7 @@
 + bugfix/arm/disable-r6040.patch
 + bugfix/arm/kurobox_fix_nr_controllers.patch
 + bugfix/arm/xfs_pack_dir2_struct.patch
++ bugfix/arm/ixp4xx_eth-build-fix.patch
 + features/arm/5281d0.patch
 + features/arm/ts409-export-leds.patch
 + features/arm/tsx09-fix-key-codes.patch