s390: qeth driver connection hang

      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>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 6fd8870551d3..032483513027 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -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);
         }
         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) {
                         __qeth_free_new_skb(skb, new_skb);
                         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");
 
         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)) {
                 memcpy(card->dev->dev_addr,
                        &cmd->data.setadapterparms.data.change_addr.addr,