summaryrefslogtreecommitdiffstats
path: root/drivers/s390/net
diff options
context:
space:
mode:
authorUrsula Braun <braunu@de.ibm.com>1970-01-01 01:00:01 +0100
committerJeff Garzik <jeff@garzik.org>2007-10-19 23:00:02 -0400
commit224426f168aa4af3dcb628e6edaa824d32d60e6f (patch)
tree11765faf4a761388e012ed4ef3be453336594598 /drivers/s390/net
parente0d5dab24deac859b1b2326c4ad0745572d16d10 (diff)
downloadblackbird-op-linux-224426f168aa4af3dcb628e6edaa824d32d60e6f.tar.gz
blackbird-op-linux-224426f168aa4af3dcb628e6edaa824d32d60e6f.zip
qeth: remove header_ops bug
Remove qeth bug caused by commit: [NET]: Move hardware header operations out of netdevice. Signed-off-by: Ursula Braun <braunu@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/s390/net')
-rw-r--r--drivers/s390/net/qeth_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index a2d08c9ba3c4..ff999ff0b627 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/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*/
OpenPOWER on IntegriCloud