---

yaml --- r: 223223 b: refs/heads/master c: 4e085e7 h: refs/heads/master i: 223221: a6520d2 223219: 5a5c911 223215: 6f2aadf v: v3
git-mirror · Dec 9, 2010 · 3473e67 · 3473e67
1 parent f4d728a
commit 3473e67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;