5 files changed, 81 insertions, 92 deletions

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 6229ba4995ad..9cf88d7201d3 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -98,9 +98,9 @@ lcs_register_debug_facility(void)
                 return -ENOMEM;
         }
         debug_register_view(lcs_dbf_setup, &debug_hex_ascii_view);
-        debug_set_level(lcs_dbf_setup, 4);
+        debug_set_level(lcs_dbf_setup, 2);
         debug_register_view(lcs_dbf_trace, &debug_hex_ascii_view);
-        debug_set_level(lcs_dbf_trace, 4);
+        debug_set_level(lcs_dbf_trace, 2);
         return 0;
 }
 
@@ -1292,9 +1292,8 @@ lcs_set_multicast_list(struct net_device *dev)
         LCS_DBF_TEXT(4, trace, "setmulti");
         card = (struct lcs_card *) dev->priv;
 
-        if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) {
+        if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) 
                 schedule_work(&card->kernel_thread_starter);
-        }
 }
 
 #endif /* CONFIG_IP_MULTICAST */
@@ -1459,6 +1458,8 @@ lcs_txbuffer_cb(struct lcs_channel *channel, struct lcs_buffer *buffer)
         lcs_release_buffer(channel, buffer);
         card = (struct lcs_card *)
                 ((char *) channel - offsetof(struct lcs_card, write));
+        if (netif_queue_stopped(card->dev))
+                netif_wake_queue(card->dev);
         spin_lock(&card->lock);
         card->tx_emitted--;
         if (card->tx_emitted <= 0 && card->tx_buffer != NULL)
@@ -1478,6 +1479,7 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
                  struct net_device *dev)
 {
         struct lcs_header *header;
+        int rc = 0;
 
         LCS_DBF_TEXT(5, trace, "hardxmit");
         if (skb == NULL) {
@@ -1492,10 +1494,8 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
                 card->stats.tx_carrier_errors++;
                 return 0;
         }
-        if (netif_queue_stopped(dev) ) {
-                card->stats.tx_dropped++;
-                return -EBUSY;
-        }
+        netif_stop_queue(card->dev);
+        spin_lock(&card->lock);
         if (card->tx_buffer != NULL &&
             card->tx_buffer->count + sizeof(struct lcs_header) +
             skb->len + sizeof(u16) > LCS_IOBUFFERSIZE)
@@ -1506,7 +1506,8 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
                 card->tx_buffer = lcs_get_buffer(&card->write);
                 if (card->tx_buffer == NULL) {
                         card->stats.tx_dropped++;
-                        return -EBUSY;
+                        rc = -EBUSY;
+                        goto out;
                 }
                 card->tx_buffer->callback = lcs_txbuffer_cb;
                 card->tx_buffer->count = 0;
@@ -1518,13 +1519,18 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
         header->type = card->lan_type;
         header->slot = card->portno;
         memcpy(header + 1, skb->data, skb->len);
+        spin_unlock(&card->lock);
         card->stats.tx_bytes += skb->len;
         card->stats.tx_packets++;
         dev_kfree_skb(skb);
-        if (card->tx_emitted <= 0)
+        netif_wake_queue(card->dev);
+        spin_lock(&card->lock);
+        if (card->tx_emitted <= 0 && card->tx_buffer != NULL)
                 /* If this is the first tx buffer emit it immediately. */
                 __lcs_emit_txbuffer(card);
-        return 0;
+out:
+        spin_unlock(&card->lock);
+        return rc;
 }
 
 static int
@@ -1535,9 +1541,7 @@ lcs_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         LCS_DBF_TEXT(5, trace, "pktxmit");
         card = (struct lcs_card *) dev->priv;
-        spin_lock(&card->lock);
         rc = __lcs_start_xmit(card, skb, dev);
-        spin_unlock(&card->lock);
         return rc;
 }
 
@@ -2319,7 +2323,6 @@ __init lcs_init_module(void)
                 PRINT_ERR("Initialization failed\n");
                 return rc;
         }
-
         return 0;
 }
 
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h
index 08e60ad43916..2fad5e40c2e4 100644
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
@@ -95,7 +95,7 @@ do {                                       \
  */
 #define LCS_ILLEGAL_OFFSET              0xffff
 #define LCS_IOBUFFERSIZE                0x5000
-#define LCS_NUM_BUFFS                   8       /* needs to be power of 2 */
+#define LCS_NUM_BUFFS                   32      /* needs to be power of 2 */
 #define LCS_MAC_LENGTH                  6
 #define LCS_INVALID_PORT_NO             -1
 #define LCS_LANCMD_TIMEOUT_DEFAULT      5
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index 9a064d4727ad..4df0fcd7b10b 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -1076,16 +1076,6 @@ qeth_get_qdio_q_format(struct qeth_card *card)
 }
 
 static inline int
-qeth_isdigit(char * buf)
-{
-        while (*buf) {
-                if (!isdigit(*buf++))
-                        return 0;
-        }
-        return 1;
-}
-
-static inline int
 qeth_isxdigit(char * buf)
 {
         while (*buf) {
@@ -1104,33 +1094,17 @@ qeth_ipaddr4_to_string(const __u8 *addr, char *buf)
 static inline int
 qeth_string_to_ipaddr4(const char *buf, __u8 *addr)
 {
-        const char *start, *end;
-        char abuf[4];
-        char *tmp;
-        int len;
-        int i;
-
-        start = buf;
-        for (i = 0; i < 4; i++) {
-                if (i == 3) {
-                        end = strchr(start,0xa);
-                        if (end)
-                                len = end - start;
-                        else            
-                                len = strlen(start);
-                }
-                else {
-                        end = strchr(start, '.');
-                        len = end - start;
-                }
-                if ((len <= 0) || (len > 3))
-                        return -EINVAL;
-                memset(abuf, 0, 4);
-                strncpy(abuf, start, len);
-                if (!qeth_isdigit(abuf))
+        int count = 0, rc = 0;
+        int in[4];
+
+        rc = sscanf(buf, "%d.%d.%d.%d%n", 
+                    &in[0], &in[1], &in[2], &in[3], &count);
+        if (rc != 4  || count) 
+                return -EINVAL;
+        for (count = 0; count < 4; count++) {
+                if (in[count] > 255)
                         return -EINVAL;
-                addr[i] = simple_strtoul(abuf, &tmp, 10);
-                start = end + 1;
+                addr[count] = in[count];
         }
         return 0;
 }
@@ -1149,36 +1123,44 @@ qeth_ipaddr6_to_string(const __u8 *addr, char *buf)
 static inline int
 qeth_string_to_ipaddr6(const char *buf, __u8 *addr)
 {
-        const char *start, *end;
-        u16 *tmp_addr;
-        char abuf[5];
-        char *tmp;
-        int len;
-        int i;
-
-        tmp_addr = (u16 *)addr;
-        start = buf;
-        for (i = 0; i < 8; i++) {
-                if (i == 7) {
-                        end = strchr(start,0xa);
-                        if (end)
-                                len = end - start;
-                        else
-                                len = strlen(start);
-                }
-                else {
-                        end = strchr(start, ':');
-                        len = end - start;
+        char *end, *start;
+        __u16 *in;
+        char num[5];
+        int num2, cnt, out, found, save_cnt;
+        unsigned short in_tmp[8] = {0, };
+
+        cnt = out = found = save_cnt = num2 = 0;
+        end = start = (char *) buf;
+        in = (__u16 *) addr;    
+        memset(in, 0, 16);
+        while (end) {
+                end = strchr(end,':');
+                if (end == NULL) {
+                        end = (char *)buf + (strlen(buf));
+                        out = 1;
+                }
+                if ((end - start)) { 
+                        memset(num, 0, 5);
+                        memcpy(num, start, end - start);
+                        if (!qeth_isxdigit(num))
+                                return -EINVAL;
+                        sscanf(start, "%x", &num2);
+                        if (found)
+                                in_tmp[save_cnt++] = num2;
+                        else
+                                in[cnt++] = num2;
+                        if (out)
+                                break;
+                } else {
+                        if (found)
+                                return -EINVAL;
+                        found = 1;
                 }
-                if ((len <= 0) || (len > 4))
-                        return -EINVAL;
-                memset(abuf, 0, 5);
-                strncpy(abuf, start, len);
-                if (!qeth_isxdigit(abuf))
-                        return -EINVAL;
-                tmp_addr[i] = simple_strtoul(abuf, &tmp, 16);
-                start = end + 1;
-        }
+                start = ++end;
+        }
+        cnt = 7;
+        while (save_cnt)
+                in[cnt--] = in_tmp[--save_cnt];
         return 0;
 }
 
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index b02313127780..82cb4af2f0e7 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -59,8 +59,7 @@ qeth_eddp_free_context(struct qeth_eddp_context *ctx)
         for (i = 0; i < ctx->num_pages; ++i)
                 free_page((unsigned long)ctx->pages[i]);
         kfree(ctx->pages);
-        if (ctx->elements != NULL)
-                kfree(ctx->elements);
+        kfree(ctx->elements);
         kfree(ctx);
 }
 
@@ -413,6 +412,13 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
         
         QETH_DBF_TEXT(trace, 5, "eddpftcp");
         eddp->skb_offset = sizeof(struct qeth_hdr) + eddp->nhl + eddp->thl;
+       if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2) {
+               eddp->skb_offset += sizeof(struct ethhdr);
+#ifdef CONFIG_QETH_VLAN
+               if (eddp->mac.h_proto == __constant_htons(ETH_P_8021Q))
+                       eddp->skb_offset += VLAN_HLEN;
+#endif /* CONFIG_QETH_VLAN */
+       }
         tcph = eddp->skb->h.th;
         while (eddp->skb_offset < eddp->skb->len) {
                 data_len = min((int)skb_shinfo(eddp->skb)->tso_size,
@@ -483,6 +489,7 @@ qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
                 return -ENOMEM;
         }
         if (qhdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER2) {
+                skb->mac.raw = (skb->data) + sizeof(struct qeth_hdr);
                 memcpy(&eddp->mac, eth_hdr(skb), ETH_HLEN);
 #ifdef CONFIG_QETH_VLAN
                 if (eddp->mac.h_proto == __constant_htons(ETH_P_8021Q)) {
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 410abeada6c4..dba7f7f02e79 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -516,7 +516,8 @@ __qeth_set_offline(struct ccwgroup_device *cgdev, int recovery_mode)
         QETH_DBF_TEXT(setup, 3, "setoffl");
         QETH_DBF_HEX(setup, 3, &card, sizeof(void *));
         
-        netif_carrier_off(card->dev);
+        if (card->dev && netif_carrier_ok(card->dev))
+                netif_carrier_off(card->dev);
         recover_flag = card->state;
         if (qeth_stop_card(card, recovery_mode) == -ERESTARTSYS){
                 PRINT_WARN("Stopping card %s interrupted by user!\n",
@@ -1679,6 +1680,7 @@ qeth_cmd_timeout(unsigned long data)
         spin_unlock_irqrestore(&reply->card->lock, flags);
 }
 
+
 static struct qeth_ipa_cmd *
 qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob)
 {
@@ -1699,7 +1701,8 @@ qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob)
                                            QETH_CARD_IFNAME(card),
                                            card->info.chpid);
                                 card->lan_online = 0;
-                                netif_carrier_off(card->dev);
+                                if (card->dev && netif_carrier_ok(card->dev))
+                                        netif_carrier_off(card->dev);
                                 return NULL;
                         case IPA_CMD_STARTLAN:
                                 PRINT_INFO("Link reestablished on %s "
@@ -5562,7 +5565,7 @@ qeth_set_multicast_list(struct net_device *dev)
         if (card->info.type == QETH_CARD_TYPE_OSN)
                 return ;
          
-        QETH_DBF_TEXT(trace,3,"setmulti");
+        QETH_DBF_TEXT(trace, 3, "setmulti");
         qeth_delete_mc_addresses(card);
         if (card->options.layer2) {
                 qeth_layer2_add_multicast(card);
@@ -5579,7 +5582,6 @@ out:
                 return;
         if (qeth_set_thread_start_bit(card, QETH_SET_PROMISC_MODE_THREAD)==0)
                 schedule_work(&card->kernel_thread_starter);
-
 }
 
 static int
@@ -7452,6 +7454,7 @@ qeth_softsetup_card(struct qeth_card *card)
                 card->lan_online = 1;
         if (card->info.type==QETH_CARD_TYPE_OSN)
                 goto out;
+        qeth_set_large_send(card, card->options.large_send);
         if (card->options.layer2) {
                 card->dev->features |=
                         NETIF_F_HW_VLAN_FILTER |
@@ -7468,12 +7471,6 @@ qeth_softsetup_card(struct qeth_card *card)
 #endif
                 goto out;
         }
-        if ((card->options.large_send == QETH_LARGE_SEND_EDDP) ||
-            (card->options.large_send == QETH_LARGE_SEND_TSO))
-                card->dev->features |= NETIF_F_TSO | NETIF_F_SG;
-        else
-                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG);
-
         if ((rc = qeth_setadapter_parms(card)))
                 QETH_DBF_TEXT_(setup, 2, "2err%d", rc);
         if ((rc = qeth_start_ipassists(card)))