rpms/kernel/devel linux-2.6-random-patches.patch,1.6,1.7

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19455

Modified Files:
	linux-2.6-random-patches.patch 
Log Message:
warning cleanup


linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 --
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c       |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c    |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c |    2 -
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c       |    5 ---
 linux-2.6.15/kernel/power/snapshot.c                       |    1 
 linux-2.6.16.noarch/drivers/net/dl2k.c                     |   17 ++++++-------
 linux-2.6.16.noarch/include/linux/dma-mapping.h            |    1 
 9 files changed, 17 insertions(+), 18 deletions(-)

Index: linux-2.6-random-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-random-patches.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-random-patches.patch	16 Apr 2006 22:58:48 -0000	1.6
+++ linux-2.6-random-patches.patch	21 Apr 2006 04:39:29 -0000	1.7
@@ -108,3 +108,92 @@
  	return 0;
  }
  
+
+drivers/net/dl2k.c:1803: warning: integer constant is too large for 'long' type
+drivers/net/dl2k.c:1813: warning: integer constant is too large for 'long' type
+drivers/net/dl2k.c:768: warning: integer constant is too large for 'long' type
+drivers/net/dl2k.c:896: warning: integer constant is too large for 'long' type
+drivers/net/dl2k.c:904: warning: integer constant is too large for 'long' type
+drivers/net/dl2k.c:916: warning: integer constant is too large for 'long' type
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.16.noarch/include/linux/dma-mapping.h~	2006-04-20 23:35:36.000000000 -0500
++++ linux-2.6.16.noarch/include/linux/dma-mapping.h	2006-04-20 23:36:12.000000000 -0500
+@@ -14,6 +14,7 @@ enum dma_data_direction {
+ };
+ 
+ #define DMA_64BIT_MASK	0xffffffffffffffffULL
++#define DMA_48BIT_MASK	0x0000ffffffffffffULL
+ #define DMA_40BIT_MASK	0x000000ffffffffffULL
+ #define DMA_39BIT_MASK	0x0000007fffffffffULL
+ #define DMA_32BIT_MASK	0x00000000ffffffffULL
+--- linux-2.6.16.noarch/drivers/net/dl2k.c~	2006-04-20 23:36:19.000000000 -0500
++++ linux-2.6.16.noarch/drivers/net/dl2k.c	2006-04-20 23:37:54.000000000 -0500
+@@ -52,8 +52,11 @@
+ #define DRV_NAME	"D-Link DL2000-based linux driver"
+ #define DRV_VERSION	"v1.17b"
+ #define DRV_RELDATE	"2006/03/10"
++
++#include <linux/dma-mapping.h>
+ #include "dl2k.h"
+ 
++
+ static char version[] __devinitdata =
+       KERN_INFO DRV_NAME " " DRV_VERSION " " DRV_RELDATE "\n";	
+ #define MAX_UNITS 8
+@@ -765,7 +768,7 @@ rio_free_tx (struct net_device *dev, int
+ 			break;
+ 		skb = np->tx_skbuff[entry];
+ 		pci_unmap_single (np->pdev,
+-				  np->tx_ring[entry].fraginfo & 0xffffffffffff,
++				  np->tx_ring[entry].fraginfo & DMA_48BIT_MASK,
+ 				  skb->len, PCI_DMA_TODEVICE);
+ 		if (irq)
+ 			dev_kfree_skb_irq (skb);
+@@ -893,15 +896,14 @@ receive_packet (struct net_device *dev)
+ 			/* Small skbuffs for short packets */
+ 			if (pkt_len > copy_thresh) {
+ 				pci_unmap_single (np->pdev,
+-						  desc->fraginfo & 0xffffffffffff,
++						  desc->fraginfo & DMA_48BIT_MASK,
+ 						  np->rx_buf_sz,
+ 						  PCI_DMA_FROMDEVICE);
+ 				skb_put (skb = np->rx_skbuff[entry], pkt_len);
+ 				np->rx_skbuff[entry] = NULL;
+ 			} else if ((skb = dev_alloc_skb (pkt_len + 2)) != NULL) {
+ 				pci_dma_sync_single_for_cpu(np->pdev,
+-				  			    desc->fraginfo & 
+-							    	0xffffffffffff,
++							    desc->fraginfo & DMA_48BIT_MASK,
+ 							    np->rx_buf_sz,
+ 							    PCI_DMA_FROMDEVICE);
+ 				skb->dev = dev;
+@@ -912,8 +914,7 @@ receive_packet (struct net_device *dev)
+ 						  pkt_len, 0);
+ 				skb_put (skb, pkt_len);
+ 				pci_dma_sync_single_for_device(np->pdev,
+-				  			       desc->fraginfo &
+-							       	 0xffffffffffff,
++							       desc->fraginfo & DMA_48BIT_MASK,
+ 							       np->rx_buf_sz,
+ 							       PCI_DMA_FROMDEVICE);
+ 			}
+@@ -1800,7 +1801,7 @@ rio_close (struct net_device *dev)
+ 		skb = np->rx_skbuff[i];
+ 		if (skb) {
+ 			pci_unmap_single(np->pdev, 
+-					 np->rx_ring[i].fraginfo & 0xffffffffffff,
++					 np->rx_ring[i].fraginfo & DMA_48BIT_MASK,
+ 					 skb->len, PCI_DMA_FROMDEVICE);
+ 			dev_kfree_skb (skb);
+ 			np->rx_skbuff[i] = NULL;
+@@ -1810,7 +1811,7 @@ rio_close (struct net_device *dev)
+ 		skb = np->tx_skbuff[i];
+ 		if (skb) {
+ 			pci_unmap_single(np->pdev, 
+-					 np->tx_ring[i].fraginfo & 0xffffffffffff,
++					 np->tx_ring[i].fraginfo & DMA_48BIT_MASK,
+ 					 skb->len, PCI_DMA_TODEVICE);
+ 			dev_kfree_skb (skb);
+ 			np->tx_skbuff[i] = NULL;