From 9ee5354074c340c0fbd210da80f6f307fb434364 Mon Sep 17 00:00:00 2001 From: "Klaus D. Wacker" Date: Wed, 29 Aug 2007 11:26:58 +0200 Subject: [PATCH] --- yaml --- r: 64669 b: refs/heads/master c: 54d0f56e63edb1aa3901ea6389bf7ea5d43d0c22 h: refs/heads/master i: 64667: a962dd22b4203bbfd63ea34653ec66b89bf38889 v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_main.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d6f500bf5892..10ee8452c2e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e55cab9f004e6e7a9ab5d7b27fb705ed0de838e +refs/heads/master: 54d0f56e63edb1aa3901ea6389bf7ea5d43d0c22 diff --git a/trunk/drivers/s390/net/qeth_main.c b/trunk/drivers/s390/net/qeth_main.c index 617fbfd767fa..f3e6fbeb2123 100644 --- a/trunk/drivers/s390/net/qeth_main.c +++ b/trunk/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;