aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net
diff options
context:
space:
mode:
authorFrank Pavlic <pavlic@de.ibm.com>2005-05-12 14:38:28 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-15 18:06:17 -0400
commit9a4558193662e933588ee53e0202c103a68c9366 (patch)
tree0bc98056fc30a3a14dce381040fc06b11432f8b2 /drivers/s390/net
parente23dd9cdd676323c95fab47dc55123ba18f7e1ff (diff)
[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>
Diffstat (limited to 'drivers/s390/net')
-rw-r--r--drivers/s390/net/qeth_main.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 2afe515f928d..e18bcf9fb588 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * 2 *
3 * linux/drivers/s390/net/qeth_main.c ($Revision: 1.209 $) 3 * linux/drivers/s390/net/qeth_main.c ($Revision: 1.210 $)
4 * 4 *
5 * Linux on zSeries OSA Express and HiperSockets support 5 * Linux on zSeries OSA Express and HiperSockets support
6 * 6 *
@@ -12,7 +12,7 @@
12 * Frank Pavlic (pavlic@de.ibm.com) and 12 * Frank Pavlic (pavlic@de.ibm.com) and
13 * Thomas Spatzier <tspat@de.ibm.com> 13 * Thomas Spatzier <tspat@de.ibm.com>
14 * 14 *
15 * $Revision: 1.209 $ $Date: 2005/04/18 11:58:48 $ 15 * $Revision: 1.210 $ $Date: 2005/04/18 17:27:39 $
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
@@ -80,7 +80,7 @@ qeth_eyecatcher(void)
80#include "qeth_eddp.h" 80#include "qeth_eddp.h"
81#include "qeth_tso.h" 81#include "qeth_tso.h"
82 82
83#define VERSION_QETH_C "$Revision: 1.209 $" 83#define VERSION_QETH_C "$Revision: 1.210 $"
84static const char *version = "qeth S/390 OSA-Express driver"; 84static const char *version = "qeth S/390 OSA-Express driver";
85 85
86/** 86/**
@@ -3959,10 +3959,10 @@ qeth_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
3959 } 3959 }
3960 } else { /* passthrough */ 3960 } else { /* passthrough */
3961 if((skb->dev->type == ARPHRD_IEEE802_TR) && 3961 if((skb->dev->type == ARPHRD_IEEE802_TR) &&
3962 !memcmp(skb->data + sizeof(struct qeth_hdr) + 2, 3962 !memcmp(skb->data + sizeof(struct qeth_hdr) +
3963 skb->dev->broadcast, 6)) { 3963 sizeof(__u16), skb->dev->broadcast, 6)) {
3964 hdr->hdr.l3.flags = QETH_CAST_BROADCAST | 3964 hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
3965 QETH_HDR_PASSTHRU; 3965 QETH_HDR_PASSTHRU;
3966 } else if (!memcmp(skb->data + sizeof(struct qeth_hdr), 3966 } else if (!memcmp(skb->data + sizeof(struct qeth_hdr),
3967 skb->dev->broadcast, 6)) { /* broadcast? */ 3967 skb->dev->broadcast, 6)) { /* broadcast? */
3968 hdr->hdr.l3.flags = QETH_CAST_BROADCAST | 3968 hdr->hdr.l3.flags = QETH_CAST_BROADCAST |