From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967889AbXJSWCP (ORCPT ); Fri, 19 Oct 2007 18:02:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S967137AbXJSWAT (ORCPT ); Fri, 19 Oct 2007 18:00:19 -0400 Received: from mtagate6.de.ibm.com ([195.212.29.155]:36582 "EHLO mtagate6.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967359AbXJSWAM (ORCPT ); Fri, 19 Oct 2007 18:00:12 -0400 Message-Id: <20071019220007.791059000@linux.vnet.ibm.com> References: <20071019215538.395133000@linux.vnet.ibm.com> User-Agent: quilt/0.46-1 Date: Thu, 01 Jan 1970 01:00:01 +0100 From: Ursula Braun To: jgarzik@pobox.com, netdev@vger.kernel.org, linux-s390@vger.kernel.org Cc: mschwid2@linux.vnet.ibm.com, apw@shadowen.org, linux-kernel@vger.kernel.org, kamalesh@linux.vnet.ibm.com, kaber@trash.net Subject: [patch 1/1] qeth: remove header_ops bug Content-Disposition: inline; filename=qeth.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Ursula Braun Remove qeth bug caused by commit: [NET]: Move hardware header operations out of netdevice. Signed-off-by: Ursula Braun --- drivers/s390/net/qeth_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: linux-2.6-uschi/drivers/s390/net/qeth_main.c =================================================================== --- linux-2.6-uschi.orig/drivers/s390/net/qeth_main.c +++ linux-2.6-uschi/drivers/s390/net/qeth_main.c @@ -6643,7 +6643,8 @@ qeth_netdev_init(struct net_device *dev) dev->vlan_rx_kill_vid = qeth_vlan_rx_kill_vid; dev->vlan_rx_add_vid = qeth_vlan_rx_add_vid; #endif - dev->header_ops = &qeth_null_ops; + if (qeth_get_netdev_flags(card) & IFF_NOARP) + dev->header_ops = &qeth_null_ops; #ifdef CONFIG_QETH_IPV6 /*IPv6 address autoconfiguration stuff*/ --