[patch 8/9] s390: qeth layer 2, fake_ll and vlan bugs.
From: Ursula Braun-Krahl <braunu@xxxxxxxxxx>
From: Frank Pavlic <pavlic@xxxxxxxxxx>
qeth network driver changes:
- Using layer 2 mode IPv6 multicast addresses has not been
registered at the OSA card (??? FIXME)
- We have to allow QETH_IP_THREAD in qeth_set_online too when
running in layer 2 mode otherwise multicast addresses won't
be registered at the OSA card.
- fake_ll improvements for dhcpcd.
- Strip ethernet header of VLAN packets before calling skb_pull.
This fixes multicast VLAN traffic stalls.
- Fix unused variable warning.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
diffstat:
drivers/s390/net/qeth_main.c | 50 +++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff -urN linux-2.6/drivers/s390/net/qeth_main.c linux-2.6-patched/drivers/s390/net/qeth_main.c
--- linux-2.6/drivers/s390/net/qeth_main.c 2005-03-02 08:38:38.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_main.c 2005-03-02 17:00:16.000000000 +0100
@@ -1,6 +1,6 @@
/*
*
- * linux/drivers/s390/net/qeth_main.c ($Revision: 1.191 $)
+ * linux/drivers/s390/net/qeth_main.c ($Revision: 1.203 $)
*
* Linux on zSeries OSA Express and HiperSockets support
*
@@ -12,7 +12,7 @@
* Frank Pavlic (pavlic@xxxxxxxxxx) and
* Thomas Spatzier <tspat@xxxxxxxxxx>
*
- * $Revision: 1.191 $ $Date: 2005/01/31 13:13:57 $
+ * $Revision: 1.203 $ $Date: 2005/03/02 15:53:57 $
*
* 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
@@ -77,7 +77,7 @@
#include "qeth_mpc.h"
#include "qeth_fs.h"
-#define VERSION_QETH_C "$Revision: 1.191 $"
+#define VERSION_QETH_C "$Revision: 1.203 $"
static const char *version = "qeth S/390 OSA-Express driver";
/**
@@ -1631,10 +1631,7 @@
QETH_DBF_TEXT(trace,3, "irla");
break;
case IPA_CMD_UNREGISTER_LOCAL_ADDR:
- PRINT_WARN("probably problem on %s: "
- "received IPA command 0x%X\n",
- QETH_CARD_IFNAME(card),
- cmd->hdr.command);
+ QETH_DBF_TEXT(trace,3, "urla");
break;
default:
PRINT_WARN("Received data is IPA "
@@ -2263,19 +2260,25 @@
struct qeth_hdr *hdr)
{
unsigned short vlan_id = 0;
+#ifdef CONFIG_QETH_VLAN
+ struct vlan_hdr *vhdr;
+#endif
skb->pkt_type = PACKET_HOST;
+ skb->protocol = qeth_type_trans(skb, skb->dev);
if (card->options.checksum_type == NO_CHECKSUMMING)
skb->ip_summed = CHECKSUM_UNNECESSARY;
else
skb->ip_summed = CHECKSUM_NONE;
#ifdef CONFIG_QETH_VLAN
if (hdr->hdr.l2.flags[2] & (QETH_LAYER2_FLAG_VLAN)) {
+ vhdr = (struct vlan_hdr *) skb->data;
+ skb->protocol =
+ __constant_htons(vhdr->h_vlan_encapsulated_proto);
vlan_id = hdr->hdr.l2.vlan_id;
skb_pull(skb, VLAN_HLEN);
}
#endif
- skb->protocol = qeth_type_trans(skb, skb->dev);
return vlan_id;
}
@@ -3388,11 +3391,9 @@
unsigned len)
{
struct ethhdr *hdr;
- struct qeth_card *card;
- card = (struct qeth_card *)dev->priv;
hdr = (struct ethhdr *)skb_push(skb, QETH_FAKE_LL_LEN);
- memcpy(hdr->h_source, card->dev->dev_addr, ETH_ALEN);
+ memcpy(hdr->h_source, dev->dev_addr, ETH_ALEN);
memcpy(hdr->h_dest, "FAKELL", ETH_ALEN);
if (type != ETH_P_802_3)
hdr->h_proto = htons(type);
@@ -3430,14 +3431,6 @@
card->perf_stats.outbound_cnt++;
card->perf_stats.outbound_start_time = qeth_get_micros();
#endif
- if (dev->hard_header == qeth_fake_header) {
- if ((skb = qeth_pskb_unshare(skb, GFP_ATOMIC)) == NULL) {
- card->stats.tx_dropped++;
- dev_kfree_skb_irq(skb);
- return 0;
- }
- skb_pull(skb, QETH_FAKE_LL_LEN);
- }
/*
* We only call netif_stop_queue in case of errors. Since we've
* got our own synchronization on queues we can keep the stack's
@@ -4060,8 +4053,17 @@
QETH_DBF_TEXT(trace, 6, "sendpkt");
- if (!card->options.layer2)
+ if (!card->options.layer2) {
ipv = qeth_get_ip_version(skb);
+ if ((card->dev->hard_header == qeth_fake_header) && ipv) {
+ if ((skb = qeth_pskb_unshare(skb,GFP_ATOMIC)) == NULL) {
+ card->stats.tx_dropped++;
+ dev_kfree_skb_irq(skb);
+ return 0;
+ }
+ skb_pull(skb, QETH_FAKE_LL_LEN);
+ }
+ }
cast_type = qeth_get_cast_type(card, skb);
queue = card->qdio.out_qs
[qeth_get_priority_queue(card, skb, ipv, cast_type)];
@@ -5242,7 +5244,8 @@
struct inet6_dev *in6_dev;
QETH_DBF_TEXT(trace,4,"chkmcv6");
- if (!qeth_is_supported(card, IPA_IPV6))
+ if ((card->options.layer2 == 0) &&
+ (!qeth_is_supported(card, IPA_IPV6)) )
return ;
in6_dev = in6_dev_get(card->dev);
@@ -7117,10 +7120,7 @@
}
/*maybe it was set offline without ifconfig down
* we can also use this state for recovery purposes*/
- if (card->options.layer2)
- qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 0);
- else
- qeth_set_allowed_threads(card, 0xffffffff, 0);
+ qeth_set_allowed_threads(card, 0xffffffff, 0);
if (recover_flag == CARD_STATE_RECOVER)
qeth_start_again(card);
qeth_notify_processes();
-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
