1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 617fbfd767fa..f3e6fbeb2123 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -2505,7 +2505,7 @@ qeth_rebuild_skb_fake_ll_tr(struct qeth_card *card, struct sk_buff *skb,
         struct iphdr *ip_hdr;
 
         QETH_DBF_TEXT(trace,5,"skbfktr");
-        skb_set_mac_header(skb, -QETH_FAKE_LL_LEN_TR);
+        skb_set_mac_header(skb, (int)-QETH_FAKE_LL_LEN_TR);
         /* this is a fake ethernet header */
         fake_hdr = tr_hdr(skb);
 
@@ -4710,9 +4710,15 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
         if (card->info.type != QETH_CARD_TYPE_IQD)
                 rc = qeth_do_send_packet(card, queue, new_skb, hdr,
                                          elements_needed, ctx);
-        else
+        else {
+                if ((skb->protocol == htons(ETH_P_ARP)) &&
+                    (card->dev->flags & IFF_NOARP)) {
+                        __qeth_free_new_skb(skb, new_skb);
+                        return -EPERM;
+                }
                 rc = qeth_do_send_packet_fast(card, queue, new_skb, hdr,
                                               elements_needed, ctx);
+        }
         if (!rc) {
                 card->stats.tx_packets++;
                 card->stats.tx_bytes += tx_bytes;