From a7188d095fdd05a44f6e40f50db8e3130dd80166 Mon Sep 17 00:00:00 2001
From: Ursula Braun <braunu@de.ibm.com>
Date: Mon, 22 Oct 2007 16:16:14 +0200
Subject: [PATCH] --- yaml --- r: 72423 b: refs/heads/master c:
 f1ecfd5d3b69d98b814435758c485e6fd0e112de h: refs/heads/master i:   72421:
 de5f04a4e14f3dfa5325ba3dd094523329851678   72419:
 ffe9150c4db4c79a8401f9d32e9674c72a2aa418   72415:
 8663450b769ad42065b3992597d0e6a6bb22aae0 v: v3

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

diff --git a/[refs] b/[refs]
index 2a7e5d1f206d..68d3557843e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b877fe288a325b9711d83628eb54e1deb63f962e
+refs/heads/master: f1ecfd5d3b69d98b814435758c485e6fd0e112de
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 4a3f54e358e5..c4de536cefa3 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -834,7 +834,7 @@ static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
 				  const void *daddr, const void *saddr,
 				  unsigned len)
 {
-	if (!dev->header_ops)
+	if (!dev->header_ops || !dev->header_ops->create)
 		return 0;
 
 	return dev->header_ops->create(skb, dev, type, daddr, saddr, len);