Fixes the following warning,
drivers/net/dl2k.c: In function 'rio_free_tx':
drivers/net/dl2k.c:768: warning: integer constant is too large for 'long' type
drivers/net/dl2k.c: In function 'receive_packet':
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
drivers/net/dl2k.c: In function 'rio_close':
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
Signed-Off-By: Daniel Walker <[email protected]>
Index: linux-2.6.16/drivers/net/dl2k.c
===================================================================
--- linux-2.6.16.orig/drivers/net/dl2k.c
+++ linux-2.6.16/drivers/net/dl2k.c
@@ -765,7 +765,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 & 0xffffffffffffULL,
skb->len, PCI_DMA_TODEVICE);
if (irq)
dev_kfree_skb_irq (skb);
@@ -893,7 +893,7 @@ 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 & 0xffffffffffffULL,
np->rx_buf_sz,
PCI_DMA_FROMDEVICE);
skb_put (skb = np->rx_skbuff[entry], pkt_len);
@@ -901,7 +901,7 @@ receive_packet (struct net_device *dev)
} else if ((skb = dev_alloc_skb (pkt_len + 2)) != NULL) {
pci_dma_sync_single_for_cpu(np->pdev,
desc->fraginfo &
- 0xffffffffffff,
+ 0xffffffffffffULL,
np->rx_buf_sz,
PCI_DMA_FROMDEVICE);
skb->dev = dev;
@@ -913,7 +913,7 @@ receive_packet (struct net_device *dev)
skb_put (skb, pkt_len);
pci_dma_sync_single_for_device(np->pdev,
desc->fraginfo &
- 0xffffffffffff,
+ 0xffffffffffffULL,
np->rx_buf_sz,
PCI_DMA_FROMDEVICE);
}
@@ -1800,7 +1800,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 & 0xffffffffffffULL,
skb->len, PCI_DMA_FROMDEVICE);
dev_kfree_skb (skb);
np->rx_skbuff[i] = NULL;
@@ -1810,7 +1810,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 & 0xffffffffffffULL,
skb->len, PCI_DMA_TODEVICE);
dev_kfree_skb (skb);
np->tx_skbuff[i] = NULL;
On Tue, May 09, 2006 at 07:55:57PM -0700, Daniel Walker wrote:
> Fixes the following warning,
Please CC netdev on networking patches.
All the changed lines are over 80 chars. Please fix.
Thanks,
Jon
> drivers/net/dl2k.c: In function 'rio_free_tx':
> drivers/net/dl2k.c:768: warning: integer constant is too large for 'long' type
> drivers/net/dl2k.c: In function 'receive_packet':
> 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
> drivers/net/dl2k.c: In function 'rio_close':
> 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
>
> Signed-Off-By: Daniel Walker <[email protected]>
>
> Index: linux-2.6.16/drivers/net/dl2k.c
> ===================================================================
> --- linux-2.6.16.orig/drivers/net/dl2k.c
> +++ linux-2.6.16/drivers/net/dl2k.c
> @@ -765,7 +765,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 & 0xffffffffffffULL,
> skb->len, PCI_DMA_TODEVICE);
> if (irq)
> dev_kfree_skb_irq (skb);
> @@ -893,7 +893,7 @@ 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 & 0xffffffffffffULL,
> np->rx_buf_sz,
> PCI_DMA_FROMDEVICE);
> skb_put (skb = np->rx_skbuff[entry], pkt_len);
> @@ -901,7 +901,7 @@ receive_packet (struct net_device *dev)
> } else if ((skb = dev_alloc_skb (pkt_len + 2)) != NULL) {
> pci_dma_sync_single_for_cpu(np->pdev,
> desc->fraginfo &
> - 0xffffffffffff,
> + 0xffffffffffffULL,
> np->rx_buf_sz,
> PCI_DMA_FROMDEVICE);
> skb->dev = dev;
> @@ -913,7 +913,7 @@ receive_packet (struct net_device *dev)
> skb_put (skb, pkt_len);
> pci_dma_sync_single_for_device(np->pdev,
> desc->fraginfo &
> - 0xffffffffffff,
> + 0xffffffffffffULL,
> np->rx_buf_sz,
> PCI_DMA_FROMDEVICE);
> }
> @@ -1800,7 +1800,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 & 0xffffffffffffULL,
> skb->len, PCI_DMA_FROMDEVICE);
> dev_kfree_skb (skb);
> np->rx_skbuff[i] = NULL;
> @@ -1810,7 +1810,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 & 0xffffffffffffULL,
> skb->len, PCI_DMA_TODEVICE);
> dev_kfree_skb (skb);
> np->tx_skbuff[i] = NULL;
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/