Commit:     54d0f56e63edb1aa3901ea6389bf7ea5d43d0c22
Parent:     6e55cab9f004e6e7a9ab5d7b27fb705ed0de838e
Author:     Klaus D. Wacker <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 29 11:26:58 2007 +0200
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Fri Aug 31 06:52:58 2007 -0400

    qeth: Drop ARP packages on HiperSockets interface with NOARP attribute.
    A network interface can get ARP packets even when the interface has
    NOARP specified. In a HiperSockets environment this disturbs receiving
    systems when packets are sent on the multicast queue. (E.g. TCP/IP on
    z/VM issues messages reporting invalid data on the HiperSockets
    Qeth will no longer send ARP packets on HiperSockets interface when
    interface has the NOARP attribute.
    Signed-off-by: Klaus D. Wacker <[EMAIL PROTECTED]>
    Signed-off-by: Ursula Braun <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/s390/net/qeth_main.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 617fbfd..f3e6fbe 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;
-       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 
        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_bytes += tx_bytes;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to