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*/