From d053dea0ad3b5111a6f0639751192af51bfceabd Mon Sep 17 00:00:00 2001
From: "Klaus D. Wacker" <kdwacker@de.ibm.com>
Date: Fri, 5 Oct 2007 16:45:44 +0200
Subject: [PATCH] --- yaml --- r: 66924 b: refs/heads/master c:
 bc4b2b497aa61c79e3f3444237a4003a254ea565 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/s390/net/qeth_main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4e7064e34d99..7c67615bbc2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3138df9f20e726c517f8df7387b5d83f5df5566
+refs/heads/master: bc4b2b497aa61c79e3f3444237a4003a254ea565
diff --git a/trunk/drivers/s390/net/qeth_main.c b/trunk/drivers/s390/net/qeth_main.c
index 778ddfb99077..b41a53816e92 100644
--- a/trunk/drivers/s390/net/qeth_main.c
+++ b/trunk/drivers/s390/net/qeth_main.c
@@ -4719,8 +4719,8 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
 		rc = qeth_do_send_packet(card, queue, new_skb, hdr,
 					 elements_needed, ctx);
 	else {
-		if ((skb->protocol == htons(ETH_P_ARP)) &&
-		    (card->dev->flags & IFF_NOARP)) {
+		if ((!card->options.layer2) &&
+		    (ipv == 0)) {
 			__qeth_free_new_skb(skb, new_skb);
 			return -EPERM;
 		}