From 9719e6768a0e5bcca99fdbbefae1020be6aa3711 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 22 Dec 2007 18:55:39 +0000
Subject: [PATCH] --- yaml --- r: 75170 b: refs/heads/master c:
 95e0918dbb6d83020ef3eb0a4276413264abd14d 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 7c44246d07f6..657c7d9b6f13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78ce8d3d1c75c22ae593ad4ccaffa19ee0e2576d
+refs/heads/master: 95e0918dbb6d83020ef3eb0a4276413264abd14d
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index 1f647b9ce352..5863190894cc 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -2211,7 +2211,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)
 
 static inline void rtl8169_make_unusable_by_asic(struct RxDesc *desc)
 {
-	desc->addr = 0x0badbadbadbadbadull;
+	desc->addr = cpu_to_le64(0x0badbadbadbadbadull);
 	desc->opts1 &= ~cpu_to_le32(DescOwn | RsvdMask);
 }
 
@@ -2835,7 +2835,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
 		}
 
 		/* Work around for AMD plateform. */
-		if ((desc->opts2 & 0xfffe000) &&
+		if ((desc->opts2 & cpu_to_le32(0xfffe000)) &&
 		    (tp->mac_version == RTL_GIGA_MAC_VER_05)) {
 			desc->opts2 = 0;
 			cur_rx++;