Commit dcb92f88 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] uintptr_t is unsigned long, not u32

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bd4f3ae1
...@@ -2016,7 +2016,7 @@ static int rtl8169_alloc_rx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff, ...@@ -2016,7 +2016,7 @@ static int rtl8169_alloc_rx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff,
if (!skb) if (!skb)
goto err_out; goto err_out;
skb_reserve(skb, (align - 1) & (u32)skb->data); skb_reserve(skb, (align - 1) & (unsigned long)skb->data);
*sk_buff = skb; *sk_buff = skb;
mapping = pci_map_single(pdev, skb->data, rx_buf_sz, 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,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); skb = dev_alloc_skb(pkt_size + align);
if (skb) { 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); eth_copy_and_sum(skb, sk_buff[0]->data, pkt_size, 0);
*sk_buff = skb; *sk_buff = skb;
rtl8169_mark_to_asic(desc, rx_buf_sz); rtl8169_mark_to_asic(desc, rx_buf_sz);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment