lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s390: qeth driver connection hang

Browse Source 
Frank Pavlic <fpavlic@de.ibm.com>

Connection hangs when using EDDP mode because sk_protocol is NULL
when skb has been copied via skb_copy. This results in dropping
packets.
Also keep MAC address after recovery of Virtual NICs so that
traffic can flow again and duplicate statements in
qeth_dev_set_route_store removed.

Signed-off-by: Ursula Braun <braunu@de.ibm.com>
Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Ursula Braun
2007-05-02 15:17:11 +02:00
committed by Jeff Garzik
parent 1a14780960
commit a4c48a2691
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/s390/net/qeth_eddp.c
View File

@@ -620,10 +620,10 @@ qeth_eddp_create_context_tcp(struct qeth_card *card, struct sk_buff *skb,
struct qeth_eddp_context * struct qeth_eddp_context *
qeth_eddp_create_context(struct qeth_card *card, struct sk_buff *skb, qeth_eddp_create_context(struct qeth_card *card, struct sk_buff *skb,
struct qeth_hdr *qhdr) struct qeth_hdr *qhdr, unsigned char sk_protocol)
{ {
QETH_DBF_TEXT(trace, 5, "creddpc"); QETH_DBF_TEXT(trace, 5, "creddpc");
switch (skb->sk->sk_protocol){ switch (sk_protocol) {
case IPPROTO_TCP: case IPPROTO_TCP:
return qeth_eddp_create_context_tcp(card, skb, qhdr); return qeth_eddp_create_context_tcp(card, skb, qhdr);
default: default:

3
drivers/s390/net/qeth_eddp.h
View File

@@ -34,7 +34,8 @@ struct qeth_eddp_context_reference {
}; };
extern struct qeth_eddp_context * extern struct qeth_eddp_context *
qeth_eddp_create_context(struct qeth_card *,struct sk_buff *,struct qeth_hdr *); qeth_eddp_create_context(struct qeth_card *,struct sk_buff *,
struct qeth_hdr *, unsigned char);
extern void extern void
qeth_eddp_put_context(struct qeth_eddp_context *); qeth_eddp_put_context(struct qeth_eddp_context *);

5
drivers/s390/net/qeth_main.c
View File

@@ -4490,7 +4490,8 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
qeth_fill_header(card, hdr, new_skb, ipv, cast_type); qeth_fill_header(card, hdr, new_skb, ipv, cast_type);
} }
if (large_send == QETH_LARGE_SEND_EDDP) { if (large_send == QETH_LARGE_SEND_EDDP) {
ctx = qeth_eddp_create_context(card, new_skb, hdr); ctx = qeth_eddp_create_context(card, new_skb, hdr,
skb->sk->sk_protocol);
if (ctx == NULL) { if (ctx == NULL) {
__qeth_free_new_skb(skb, new_skb); __qeth_free_new_skb(skb, new_skb);
PRINT_WARN("could not create eddp context\n"); PRINT_WARN("could not create eddp context\n");
@@ -6651,7 +6652,7 @@ qeth_setadpparms_change_macaddr_cb(struct qeth_card *card,
QETH_DBF_TEXT(trace,4,"chgmaccb"); QETH_DBF_TEXT(trace,4,"chgmaccb");
cmd = (struct qeth_ipa_cmd *) data; cmd = (struct qeth_ipa_cmd *) data;
if (!card->options.layer2 || card->info.guestlan || if (!card->options.layer2 ||
!(card->info.mac_bits & QETH_LAYER2_MAC_READ)) { !(card->info.mac_bits & QETH_LAYER2_MAC_READ)) {
memcpy(card->dev->dev_addr, memcpy(card->dev->dev_addr,
&cmd->data.setadapterparms.data.change_addr.addr, &cmd->data.setadapterparms.data.change_addr.addr,

2
drivers/s390/net/qeth_sys.c
View File

@@ -384,8 +384,6 @@ qeth_dev_route_store(struct qeth_card *card, struct qeth_routing_info *route,
route->type = PRIMARY_CONNECTOR; route->type = PRIMARY_CONNECTOR;
} else if (!strcmp(tmp, "secondary_connector")) { } else if (!strcmp(tmp, "secondary_connector")) {
route->type = SECONDARY_CONNECTOR; route->type = SECONDARY_CONNECTOR;
} else if (!strcmp(tmp, "multicast_router")) {
route->type = MULTICAST_ROUTER;
} else if (!strcmp(tmp, "primary_router")) { } else if (!strcmp(tmp, "primary_router")) {
route->type = PRIMARY_ROUTER; route->type = PRIMARY_ROUTER;
} else if (!strcmp(tmp, "secondary_router")) { } else if (!strcmp(tmp, "secondary_router")) {