aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-09 11:39:00 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 12:14:08 -0500
commitdcb92f8804717b845db70939b523c5d152a2e0ea (patch)
tree22a5df375c4cb7ac9e3a3dfdde7f0773d8b3c4dd /drivers/net
parentbd4f3ae1a1524114f7a8051214bacea2fe7813b8 (diff)
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/r8169.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 577babd4c938..5598d86380b4 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,
2016 if (!skb) 2016 if (!skb)
2017 goto err_out; 2017 goto err_out;
2018 2018
2019 skb_reserve(skb, (align - 1) & (u32)skb->data); 2019 skb_reserve(skb, (align - 1) & (unsigned long)skb->data);
2020 *sk_buff = skb; 2020 *sk_buff = skb;
2021 2021
2022 mapping = pci_map_single(pdev, skb->data, rx_buf_sz, 2022 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,
2487 2487
2488 skb = dev_alloc_skb(pkt_size + align); 2488 skb = dev_alloc_skb(pkt_size + align);
2489 if (skb) { 2489 if (skb) {
2490 skb_reserve(skb, (align - 1) & (u32)skb->data); 2490 skb_reserve(skb, (align - 1) & (unsigned long)skb->data);
2491 eth_copy_and_sum(skb, sk_buff[0]->data, pkt_size, 0); 2491 eth_copy_and_sum(skb, sk_buff[0]->data, pkt_size, 0);
2492 *sk_buff = skb; 2492 *sk_buff = skb;
2493 rtl8169_mark_to_asic(desc, rx_buf_sz); 2493 rtl8169_mark_to_asic(desc, rx_buf_sz);