From 8644555c3e62924857708f7bc8404bacdb570e51 Mon Sep 17 00:00:00 2001
From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Thu, 4 Oct 2007 11:38:43 -0700
Subject: [PATCH] --- yaml --- r: 66929 b: refs/heads/master c:
 589c085f2734537dce4a8b59a1d49006479e33d1 h: refs/heads/master i:   66927:
 58f0d1a91608be95bea75f602e02b60e298da6ee v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/e1000e/hw.h     | 2 +-
 trunk/drivers/net/e1000e/netdev.c | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f2c5bd35ed65..400a4c406e0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28692ec45e58f40a998beb155fe1c0d3e1167485
+refs/heads/master: 589c085f2734537dce4a8b59a1d49006479e33d1
diff --git a/trunk/drivers/net/e1000e/hw.h b/trunk/drivers/net/e1000e/hw.h
index 848217a38259..aa82f1afb7fb 100644
--- a/trunk/drivers/net/e1000e/hw.h
+++ b/trunk/drivers/net/e1000e/hw.h
@@ -852,7 +852,7 @@ struct e1000_hw {
 
 #ifdef DEBUG
 #define hw_dbg(hw, format, arg...) \
-	printk(KERN_DEBUG, "%s: " format, e1000_get_hw_dev_name(hw), ##arg);
+	printk(KERN_DEBUG, "%s: " format, e1000e_get_hw_dev_name(hw), ##arg);
 #else
 static inline int __attribute__ ((format (printf, 2, 3)))
 hw_dbg(struct e1000_hw *hw, const char *format, ...)
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index 4a21d7df1743..3a0bb2afe387 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/drivers/net/e1000e/netdev.c
@@ -66,9 +66,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
  **/
 char *e1000e_get_hw_dev_name(struct e1000_hw *hw)
 {
-	struct e1000_adapter *adapter = hw->back;
-	struct net_device *netdev = adapter->netdev;
-	return netdev->name;
+	return hw->adapter->netdev->name;
 }
 #endif