[PATCH] s390: qeth bug fixes

[patch 9/10] s390: qeth bug fixes.

From: Frank Pavlic <pavlic@de.ibm.com>

qeth network driver changes:
 - Use sizeof(__u16) instead of '2' in qeth_fill_header.

Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
This commit is contained in:
Frank Pavlic
2005-05-12 20:38:28 +02:00
committed by Jeff Garzik
parent e23dd9cdd6
commit 9a45581936

View File

@@ -1,6 +1,6 @@
/* /*
* *
* linux/drivers/s390/net/qeth_main.c ($Revision: 1.209 $) * linux/drivers/s390/net/qeth_main.c ($Revision: 1.210 $)
* *
* Linux on zSeries OSA Express and HiperSockets support * Linux on zSeries OSA Express and HiperSockets support
* *
@@ -12,7 +12,7 @@
* Frank Pavlic (pavlic@de.ibm.com) and * Frank Pavlic (pavlic@de.ibm.com) and
* Thomas Spatzier <tspat@de.ibm.com> * Thomas Spatzier <tspat@de.ibm.com>
* *
* $Revision: 1.209 $ $Date: 2005/04/18 11:58:48 $ * $Revision: 1.210 $ $Date: 2005/04/18 17:27:39 $
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -80,7 +80,7 @@ qeth_eyecatcher(void)
#include "qeth_eddp.h" #include "qeth_eddp.h"
#include "qeth_tso.h" #include "qeth_tso.h"
#define VERSION_QETH_C "$Revision: 1.209 $" #define VERSION_QETH_C "$Revision: 1.210 $"
static const char *version = "qeth S/390 OSA-Express driver"; static const char *version = "qeth S/390 OSA-Express driver";
/** /**
@@ -3959,10 +3959,10 @@ qeth_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
} }
} else { /* passthrough */ } else { /* passthrough */
if((skb->dev->type == ARPHRD_IEEE802_TR) && if((skb->dev->type == ARPHRD_IEEE802_TR) &&
!memcmp(skb->data + sizeof(struct qeth_hdr) + 2, !memcmp(skb->data + sizeof(struct qeth_hdr) +
skb->dev->broadcast, 6)) { sizeof(__u16), skb->dev->broadcast, 6)) {
hdr->hdr.l3.flags = QETH_CAST_BROADCAST | hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
QETH_HDR_PASSTHRU; QETH_HDR_PASSTHRU;
} else if (!memcmp(skb->data + sizeof(struct qeth_hdr), } else if (!memcmp(skb->data + sizeof(struct qeth_hdr),
skb->dev->broadcast, 6)) { /* broadcast? */ skb->dev->broadcast, 6)) { /* broadcast? */
hdr->hdr.l3.flags = QETH_CAST_BROADCAST | hdr->hdr.l3.flags = QETH_CAST_BROADCAST |