From 3473e67bdb3ba3f9525f51430221ef1c93b3c948 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 8 Dec 2010 18:42:23 -0800
Subject: [PATCH] --- yaml --- r: 223223 b: refs/heads/master c:
 4e085e76cbe558b79b54cbab772f61185879bc64 h: refs/heads/master i:   223221:
 a6520d2af12019a10c05bcf8121c7d6ad37a806b   223219:
 5a5c91140f2728bbfd6e988916e9bad125132f5f   223215:
 6f2aadfbb1757face5ddf21c1dd93c14bd8fa82c v: v3

---
 [refs]                       | 2 +-
 trunk/net/econet/af_econet.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c5e894843ade..5e4f04da26e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f19872575ff7819a3723154657a497d9bca66b33
+refs/heads/master: 4e085e76cbe558b79b54cbab772f61185879bc64
diff --git a/trunk/net/econet/af_econet.c b/trunk/net/econet/af_econet.c
index f180371fa415..15dcc1a586b4 100644
--- a/trunk/net/econet/af_econet.c
+++ b/trunk/net/econet/af_econet.c
@@ -851,9 +851,13 @@ static void aun_incoming(struct sk_buff *skb, struct aunhdr *ah, size_t len)
 {
 	struct iphdr *ip = ip_hdr(skb);
 	unsigned char stn = ntohl(ip->saddr) & 0xff;
+	struct dst_entry *dst = skb_dst(skb);
+	struct ec_device *edev = NULL;
 	struct sock *sk = NULL;
 	struct sk_buff *newskb;
-	struct ec_device *edev = skb->dev->ec_ptr;
+
+	if (dst)
+		edev = dst->dev->ec_ptr;
 
 	if (! edev)
 		goto bad;