---

yaml --- r: 71799 b: refs/heads/master c: 224426f h: refs/heads/master i: 71797: d539e80 71795: 63d98ab 71791: c64804f v: v3
git-mirror · Oct 20, 2007 · bd2f3ee · bd2f3ee
1 parent 3cd17bd
commit bd2f3ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0d5dab24deac859b1b2326c4ad0745572d16d10
+refs/heads/master: 224426f168aa4af3dcb628e6edaa824d32d60e6f
diff --git a/trunk/drivers/s390/net/qeth_main.c b/trunk/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*/