From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 9 Feb 2007 16:39:00 +0000 (+0000)
Subject: [PATCH] uintptr_t is unsigned long, not u32
X-Git-Tag: v2.6.21-rc1~83^2~26
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dcb92f8804717b845db70939b523c5d152a2e0ea;p=linux-2.6-omap-h63xx.git

[PATCH] uintptr_t is unsigned long, not u32

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 577babd4c93..5598d86380b 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2016,7 +2016,7 @@ static int rtl8169_alloc_rx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff,
 	if (!skb)
 		goto err_out;
 
-	skb_reserve(skb, (align - 1) & (u32)skb->data);
+	skb_reserve(skb, (align - 1) & (unsigned long)skb->data);
 	*sk_buff = skb;
 
 	mapping = pci_map_single(pdev, skb->data, rx_buf_sz,
@@ -2487,7 +2487,7 @@ static inline int rtl8169_try_rx_copy(struct sk_buff **sk_buff, int pkt_size,
 
 		skb = dev_alloc_skb(pkt_size + align);
 		if (skb) {
-			skb_reserve(skb, (align - 1) & (u32)skb->data);
+			skb_reserve(skb, (align - 1) & (unsigned long)skb->data);
 			eth_copy_and_sum(skb, sk_buff[0]->data, pkt_size, 0);
 			*sk_buff = skb;
 			rtl8169_mark_to_asic(desc, rx_buf_sz);