From b1e4fa7a52ca17fd29b2f01631c0da1c03f0e270 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 11 Oct 2007 02:44:23 -0700
Subject: [PATCH] --- yaml --- r: 67071 b: refs/heads/master c:
 d71fce6b932d83e0a1caa49dfa5a536fd50f07c9 h: refs/heads/master i:   67069:
 5353d49110d4be2ba796952dc57239a9a2a3f2f7   67067:
 550d282ff52eaf5dd841f74ed390fd515a84efe1   67063:
 23dcd250d838f450934c5fa59ae6385f315405d8   67055:
 7f17a275acf5122ee74acf51feca331a26c5e1ea   67039:
 cb7b42b428d4eedf93d4806474e8e1d3d7276ee4   67007:
 69f88417c94ec7c849f02d266bf3b5aa3bd2f145   66943:
 43fe09100968652dae22b1bc366df2dea510d833   66815:
 df0a3b014cd09c31a05638722b9a887475e2ec96   66559:
 f6416ee65f5cbf1a0df0616c9962db317483ff7c v: v3

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

diff --git a/[refs] b/[refs]
index 40dd8f465af6..f445211c867e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28f7b0360f46eeb9eeee63d03bb5484918a54837
+refs/heads/master: d71fce6b932d83e0a1caa49dfa5a536fd50f07c9
diff --git a/trunk/drivers/s390/net/qeth_main.c b/trunk/drivers/s390/net/qeth_main.c
index c67e7dfd56cc..a2d08c9ba3c4 100644
--- a/trunk/drivers/s390/net/qeth_main.c
+++ b/trunk/drivers/s390/net/qeth_main.c
@@ -6580,11 +6580,12 @@ qeth_hard_header_parse(const struct sk_buff *skb, unsigned char *haddr)
 {
 	const struct qeth_card *card;
 	const struct ethhdr *eth;
+	struct net_device *dev = skb->dev;
 
 	if (dev->type != ARPHRD_IEEE802_TR)
 		return 0;
 
-	card = qeth_get_card_from_dev(skb->dev);
+	card = qeth_get_card_from_dev(dev);
 	if (card->options.layer2)
 		goto haveheader;
 #ifdef CONFIG_QETH_IPV6