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);