From: Ursula Braun <braunu@de.ibm.com>
Date: Mon, 22 Oct 2007 14:16:14 +0000 (+0200)
Subject: remove header_ops bug in qeth driver
X-Git-Tag: v2.6.24-rc1~15^2~11
X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f1ecfd5d3b69d98b814435758c485e6fd0e112de;p=linux-2.6-omap-h63xx.git

remove header_ops bug in qeth driver

Remove qeth bug caused by commit:
[NET]: Move hardware header operations out of netdevice.

This is the second part of the qeth header_ops patch, since
first patch sent 10/19 has been insufficient.
Nevertheless first patch is still valid and should be kept.

Signed-off-by: Ursula Braun <braunu@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 4a3f54e358e..c4de536cefa 100644
--- a/include/linux/netdevice.h
+++ b/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);