From 3b94f4c73a77a043d3e66a1e4d3655c1847b4e96 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Thu, 18 Oct 2007 05:09:28 -0700
Subject: [PATCH] --- yaml --- r: 71297 b: refs/heads/master c:
 1b83336bb9fa4f110b5b0a4378a82cd5f0fd0ac8 h: refs/heads/master i:   71295:
 c6f116d09a690d0eb2fb746ed8b07da862fdb83b v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3cbbc16d8c3f..41d747c6dab7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df2e014bfbbf26d160e1bf47b05fc05c96205e2b
+refs/heads/master: 1b83336bb9fa4f110b5b0a4378a82cd5f0fd0ac8
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 39dd83b183a9..452c88d971ad 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -827,7 +827,7 @@ static inline int dev_parse_header(const struct sk_buff *skb,
 {
 	const struct net_device *dev = skb->dev;
 
-	if (!dev->header_ops->parse)
+	if (!dev->header_ops || !dev->header_ops->parse)
 		return 0;
 	return dev->header_ops->parse(skb, haddr);
 }