From 11e5b8299c01362f0776466787af6469d136bc44 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 9 Feb 2007 16:39:00 +0000 Subject: [PATCH] --- yaml --- r: 47277 b: refs/heads/master c: dcb92f8804717b845db70939b523c5d152a2e0ea h: refs/heads/master i: 47275: 7dc82101afb9e278286be42dc6d99c338d750d84 v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 47631ad17a80..12226912d9be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd4f3ae1a1524114f7a8051214bacea2fe7813b8 +refs/heads/master: dcb92f8804717b845db70939b523c5d152a2e0ea diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index 577babd4c938..5598d86380b4 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/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);