[patch 0/2] remove header_ops bug in qeth driver (part 2)

[patch 0/2] remove header_ops bug in qeth driver (part 2)

[Ursula Braun]

-- 
Jeff,

another patch in include/linux/netdevice.h is necessary
to solve the qeth bug of 2.6.23-git

And an update of the MAINTAINERS file is appended.

Regards,   Ursula Braun

[patch 1/2] : remove header_ops bug in qeth driver

[Ursula Braun]

[-- Attachment #1: qeth.patch --]
[-- Type: text/plain, Size: 945 bytes --]

From: Ursula Braun <braunu@de.ibm.com>

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>
---
 include/linux/netdevice.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-uschi/include/linux/netdevice.h
===================================================================
--- linux-2.6-uschi.orig/include/linux/netdevice.h
+++ linux-2.6-uschi/include/linux/netdevice.h
@@ -834,7 +834,7 @@ static inline int dev_hard_header(struct
 				  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);

-- 

Re: [patch 1/2] : remove header_ops bug in qeth driver

[Jeff Garzik]

applied 1-2

[patch 2/2] s390 MAINTAINERS

[Ursula Braun]

[-- Attachment #1: maintainer.patch --]
[-- Type: text/plain, Size: 703 bytes --]

From: Ursula Braun <braunu@de.ibm.com>

adding Frank Blaschka to s390 networking maintainers

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: Ursula Braun <braunu@de.ibm.com>

---
 MAINTAINERS |    2 ++
 1 file changed, 2 insertions(+)

Index: linux-2.6-uschi/MAINTAINERS
===================================================================
--- linux-2.6-uschi.orig/MAINTAINERS
+++ linux-2.6-uschi/MAINTAINERS
@@ -3246,6 +3246,8 @@ S:	Supported
 S390 NETWORK DRIVERS
 P:	Ursula Braun
 M:	ubraun@linux.vnet.ibm.com
+P:	Frank Blaschka
+M:	blaschka@linux.vnet.ibm.com
 M:	linux390@de.ibm.com
 L:	linux-s390@vger.kernel.org
 W:	http://www.ibm.com/developerworks/linux/linux390/

--