From 40de5f25104f86d9328d6c288c4f4875faf1f87f Mon Sep 17 00:00:00 2001
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Fri, 17 Nov 2006 23:15:17 +0100
Subject: [PATCH] --- yaml --- r: 43240 b: refs/heads/master c:
 cc9f022d97d08e4e36d38661857991fe91447d68 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r8169.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 175b3ec7f49c..c34d1d8224b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12d86f682e8acad8555718dc7b0082590f2365d0
+refs/heads/master: cc9f022d97d08e4e36d38661857991fe91447d68
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index 0b57050252eb..2379d83768d6 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -2018,7 +2018,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);
+	skb_reserve(skb, (align - 1) & (u32)skb->data);
 	*sk_buff = skb;
 
 	mapping = pci_map_single(pdev, skb->data, rx_buf_sz,
@@ -2486,7 +2486,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);
+			skb_reserve(skb, (align - 1) & (u32)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);