1 files changed, 55 insertions, 52 deletions

diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index cb14642d97aa..9e671a48cd2f 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -513,7 +513,7 @@ __qeth_set_offline(struct ccwgroup_device *cgdev, int recovery_mode)
 
         QETH_DBF_TEXT(setup, 3, "setoffl");
         QETH_DBF_HEX(setup, 3, &card, sizeof(void *));
-        
+
         if (card->dev && netif_carrier_ok(card->dev))
                 netif_carrier_off(card->dev);
         recover_flag = card->state;
@@ -604,13 +604,13 @@ __qeth_ref_ip_on_card(struct qeth_card *card, struct qeth_ipaddr *todo,
         list_for_each_entry(addr, &card->ip_list, entry) {
                 if (card->options.layer2) {
                         if ((addr->type == todo->type) &&
-                            (memcmp(&addr->mac, &todo->mac, 
+                            (memcmp(&addr->mac, &todo->mac,
                                     OSA_ADDR_LEN) == 0)) {
                                 found = 1;
                                 break;
                         }
                         continue;
-                } 
+                }
                 if ((addr->proto     == QETH_PROT_IPV4)  &&
                     (todo->proto     == QETH_PROT_IPV4)  &&
                     (addr->type      == todo->type)      &&
@@ -694,13 +694,13 @@ __qeth_insert_ip_todo(struct qeth_card *card, struct qeth_ipaddr *addr, int add)
                 if (card->options.layer2) {
                         if ((tmp->type  == addr->type)  &&
                             (tmp->is_multicast == addr->is_multicast) &&
-                            (memcmp(&tmp->mac, &addr->mac, 
+                            (memcmp(&tmp->mac, &addr->mac,
                                     OSA_ADDR_LEN) == 0)) {
                                 found = 1;
                                 break;
                         }
                         continue;
-                }        
+                }
                 if ((tmp->proto        == QETH_PROT_IPV4)     &&
                     (addr->proto       == QETH_PROT_IPV4)     &&
                     (tmp->type         == addr->type)         &&
@@ -1173,7 +1173,7 @@ qeth_determine_card_type(struct qeth_card *card)
                                            "due to hardware limitations!\n");
                                 card->qdio.no_out_queues = 1;
                                 card->qdio.default_out_queue = 0;
-                        } 
+                        }
                         return 0;
                 }
                 i++;
@@ -1198,7 +1198,7 @@ qeth_probe_device(struct ccwgroup_device *gdev)
                 return -ENODEV;
 
         QETH_DBF_TEXT_(setup, 2, "%s", gdev->dev.bus_id);
-        
+
         card = qeth_alloc_card();
         if (!card) {
                 put_device(dev);
@@ -1220,7 +1220,7 @@ qeth_probe_device(struct ccwgroup_device *gdev)
                 put_device(dev);
                 qeth_free_card(card);
                 return rc;
-        }                           
+        }
         if ((rc = qeth_setup_card(card))){
                 QETH_DBF_TEXT_(setup, 2, "2err%d", rc);
                 put_device(dev);
@@ -1843,7 +1843,7 @@ struct qeth_cmd_buffer *iob)
                &card->seqno.pdu_hdr_ack, QETH_SEQ_NO_LENGTH);
         QETH_DBF_HEX(control, 2, iob->data, QETH_DBF_CONTROL_LEN);
 }
-                                                    
+
 static int
 qeth_send_control_data(struct qeth_card *card, int len,
                        struct qeth_cmd_buffer *iob,
@@ -1937,7 +1937,7 @@ qeth_osn_send_control_data(struct qeth_card *card, int len,
                 wake_up(&card->wait_q);
         }
         return rc;
-}                                       
+}
 
 static inline void
 qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,
@@ -1966,7 +1966,7 @@ qeth_osn_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,
         memcpy(QETH_IPA_PDU_LEN_PDU3(iob->data), &s2, 2);
         return qeth_osn_send_control_data(card, s1, iob);
 }
-                                                            
+
 static int
 qeth_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,
                   int (*reply_cb)
@@ -2579,7 +2579,7 @@ qeth_process_inbound_buffer(struct qeth_card *card,
                 skb->dev = card->dev;
                 if (hdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER2)
                         vlan_tag = qeth_layer2_rebuild_skb(card, skb, hdr);
-                else if (hdr->hdr.l3.id == QETH_HEADER_TYPE_LAYER3)     
+                else if (hdr->hdr.l3.id == QETH_HEADER_TYPE_LAYER3)
                         qeth_rebuild_skb(card, skb, hdr);
                 else { /*in case of OSN*/
                         skb_push(skb, sizeof(struct qeth_hdr));
@@ -2763,7 +2763,7 @@ qeth_qdio_input_handler(struct ccw_device * ccwdev, unsigned int status,
                 index = i % QDIO_MAX_BUFFERS_PER_Q;
                 buffer = &card->qdio.in_q->bufs[index];
                 if (!((status & QDIO_STATUS_LOOK_FOR_ERROR) &&
-                      qeth_check_qdio_errors(buffer->buffer, 
+                      qeth_check_qdio_errors(buffer->buffer,
                                              qdio_err, siga_err,"qinerr")))
                         qeth_process_inbound_buffer(card, buffer, index);
                 /* clear buffer and give back to hardware */
@@ -3187,7 +3187,7 @@ qeth_alloc_qdio_buffers(struct qeth_card *card)
         if (card->qdio.state == QETH_QDIO_ALLOCATED)
                 return 0;
 
-        card->qdio.in_q = kmalloc(sizeof(struct qeth_qdio_q), 
+        card->qdio.in_q = kmalloc(sizeof(struct qeth_qdio_q),
                                   GFP_KERNEL|GFP_DMA);
         if (!card->qdio.in_q)
                 return - ENOMEM;
@@ -3476,7 +3476,7 @@ qeth_halt_channels(struct qeth_card *card)
         rc3 = qeth_halt_channel(&card->data);
         if (rc1)
                 return rc1;
-        if (rc2) 
+        if (rc2)
                 return rc2;
         return rc3;
 }
@@ -3491,7 +3491,7 @@ qeth_clear_channels(struct qeth_card *card)
         rc3 = qeth_clear_channel(&card->data);
         if (rc1)
                 return rc1;
-        if (rc2) 
+        if (rc2)
                 return rc2;
         return rc3;
 }
@@ -3798,10 +3798,10 @@ qeth_open(struct net_device *dev)
                 QETH_DBF_TEXT(trace,4,"nomacadr");
                 return -EPERM;
         }
-        card->dev->flags |= IFF_UP;
-        netif_start_queue(dev);
         card->data.state = CH_STATE_UP;
         card->state = CARD_STATE_UP;
+        card->dev->flags |= IFF_UP;
+        netif_start_queue(dev);
 
         if (!card->lan_online && netif_carrier_ok(dev))
                 netif_carrier_off(dev);
@@ -3817,7 +3817,7 @@ qeth_stop(struct net_device *dev)
 
         card = (struct qeth_card *) dev->priv;
 
-        netif_stop_queue(dev);
+        netif_tx_disable(dev);
         card->dev->flags &= ~IFF_UP;
         if (card->state == CARD_STATE_UP)
                 card->state = CARD_STATE_SOFTSETUP;
@@ -3958,7 +3958,7 @@ qeth_prepare_skb(struct qeth_card *card, struct sk_buff **skb,
 #endif
         *hdr = (struct qeth_hdr *)
                 qeth_push_skb(card, skb, sizeof(struct qeth_hdr));
-        if (hdr == NULL)
+        if (*hdr == NULL)
                 return -EINVAL;
         return 0;
 }
@@ -4098,7 +4098,7 @@ qeth_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
                 }
         } else { /* passthrough */
                 if((skb->dev->type == ARPHRD_IEEE802_TR) &&
-                    !memcmp(skb->data + sizeof(struct qeth_hdr) + 
+                    !memcmp(skb->data + sizeof(struct qeth_hdr) +
                     sizeof(__u16), skb->dev->broadcast, 6)) {
                         hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
                                                 QETH_HDR_PASSTHRU;
@@ -4385,7 +4385,7 @@ out:
 }
 
 static inline int
-qeth_get_elements_no(struct qeth_card *card, void *hdr, 
+qeth_get_elements_no(struct qeth_card *card, void *hdr,
                      struct sk_buff *skb, int elems)
 {
         int elements_needed = 0;
@@ -4416,6 +4416,8 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
         enum qeth_large_send_types large_send = QETH_LARGE_SEND_NO;
         struct qeth_eddp_context *ctx = NULL;
         int tx_bytes = skb->len;
+        unsigned short nr_frags = skb_shinfo(skb)->nr_frags;
+        unsigned short tso_size = skb_shinfo(skb)->tso_size;
         int rc;
 
         QETH_DBF_TEXT(trace, 6, "sendpkt");
@@ -4441,7 +4443,7 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                 return 0;
         }
         cast_type = qeth_get_cast_type(card, skb);
-        if ((cast_type == RTN_BROADCAST) && 
+        if ((cast_type == RTN_BROADCAST) &&
             (card->info.broadcast_capable == 0)){
                 card->stats.tx_dropped++;
                 card->stats.tx_errors++;
@@ -4463,7 +4465,7 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                         card->stats.tx_errors++;
                         dev_kfree_skb_any(skb);
                         return NETDEV_TX_OK;
-                } 
+                }
                 elements_needed++;
         } else {
                 if ((rc = qeth_prepare_skb(card, &skb, &hdr, ipv))) {
@@ -4498,16 +4500,16 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                 card->stats.tx_packets++;
                 card->stats.tx_bytes += tx_bytes;
 #ifdef CONFIG_QETH_PERF_STATS
-                if (skb_shinfo(skb)->tso_size &&
+                if (tso_size &&
                    !(large_send == QETH_LARGE_SEND_NO)) {
-                        card->perf_stats.large_send_bytes += skb->len;
+                        card->perf_stats.large_send_bytes += tx_bytes;
                         card->perf_stats.large_send_cnt++;
                 }
-                if (skb_shinfo(skb)->nr_frags > 0){
+                if (nr_frags > 0){
                         card->perf_stats.sg_skbs_sent++;
                         /* nr_frags + skb->data */
                         card->perf_stats.sg_frags_sent +=
-                                skb_shinfo(skb)->nr_frags + 1;
+                                nr_frags + 1;
                 }
 #endif /* CONFIG_QETH_PERF_STATS */
         }
@@ -5373,7 +5375,7 @@ qeth_layer2_send_setdelvlan_cb(struct qeth_card *card,
         cmd = (struct qeth_ipa_cmd *) data;
         if (cmd->hdr.return_code) {
                 PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. "
-                          "Continuing\n",cmd->data.setdelvlan.vlan_id, 
+                          "Continuing\n",cmd->data.setdelvlan.vlan_id,
                           QETH_CARD_IFNAME(card), cmd->hdr.return_code);
                 QETH_DBF_TEXT_(trace, 2, "L2VL%4x", cmd->hdr.command);
                 QETH_DBF_TEXT_(trace, 2, "L2%s", CARD_BUS_ID(card));
@@ -5393,7 +5395,7 @@ qeth_layer2_send_setdelvlan(struct qeth_card *card, __u16 i,
         iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);
         cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
         cmd->data.setdelvlan.vlan_id = i;
-        return qeth_send_ipa_cmd(card, iob, 
+        return qeth_send_ipa_cmd(card, iob,
                                  qeth_layer2_send_setdelvlan_cb, NULL);
 }
 
@@ -5457,7 +5459,7 @@ qeth_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
  * Examine hardware response to SET_PROMISC_MODE
  */
 static int
-qeth_setadp_promisc_mode_cb(struct qeth_card *card, 
+qeth_setadp_promisc_mode_cb(struct qeth_card *card,
                             struct qeth_reply *reply,
                             unsigned long data)
 {
@@ -5468,10 +5470,10 @@ qeth_setadp_promisc_mode_cb(struct qeth_card *card,
 
         cmd = (struct qeth_ipa_cmd *) data;
         setparms = &(cmd->data.setadapterparms);
-        
+
         qeth_default_setadapterparms_cb(card, reply, (unsigned long)cmd);
-        if (cmd->hdr.return_code) { 
-                QETH_DBF_TEXT_(trace,4,"prmrc%2.2x",cmd->hdr.return_code);      
+        if (cmd->hdr.return_code) {
+                QETH_DBF_TEXT_(trace,4,"prmrc%2.2x",cmd->hdr.return_code);
                 setparms->data.mode = SET_PROMISC_MODE_OFF;
         }
         card->info.promisc_mode = setparms->data.mode;
@@ -5517,7 +5519,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_delete_mc_addresses(card);
         if (card->options.layer2) {
@@ -5575,7 +5577,7 @@ qeth_osn_assist(struct net_device *dev,
         struct qeth_cmd_buffer *iob;
         struct qeth_card *card;
         int rc;
-        
+
         QETH_DBF_TEXT(trace, 2, "osnsdmc");
         if (!dev)
                 return -ENODEV;
@@ -5654,7 +5656,7 @@ qeth_osn_deregister(struct net_device * dev)
         card->osn_info.data_cb = NULL;
         return;
 }
-                                           
+
 static void
 qeth_delete_mc_addresses(struct qeth_card *card)
 {
@@ -5818,7 +5820,7 @@ qeth_add_multicast_ipv6(struct qeth_card *card)
         struct inet6_dev *in6_dev;
 
         QETH_DBF_TEXT(trace,4,"chkmcv6");
-        if (!qeth_is_supported(card, IPA_IPV6)) 
+        if (!qeth_is_supported(card, IPA_IPV6))
                 return ;
         in6_dev = in6_dev_get(card->dev);
         if (in6_dev == NULL)
@@ -6359,12 +6361,9 @@ qeth_netdev_init(struct net_device *dev)
         dev->vlan_rx_kill_vid = qeth_vlan_rx_kill_vid;
         dev->vlan_rx_add_vid = qeth_vlan_rx_add_vid;
 #endif
-        dev->hard_header = card->orig_hard_header;
         if (qeth_get_netdev_flags(card) & IFF_NOARP) {
                 dev->rebuild_header = NULL;
                 dev->hard_header = NULL;
-                if (card->options.fake_ll)
-                        dev->hard_header = qeth_fake_header;
                 dev->header_cache_update = NULL;
                 dev->hard_header_cache = NULL;
         }
@@ -6373,6 +6372,9 @@ qeth_netdev_init(struct net_device *dev)
         if (!(card->info.unique_id & UNIQUE_ID_NOT_BY_CARD))
                 card->dev->dev_id = card->info.unique_id & 0xffff;
 #endif
+        if (card->options.fake_ll &&
+                (qeth_get_netdev_flags(card) & IFF_NOARP))
+                        dev->hard_header = qeth_fake_header;
         dev->hard_header_parse = NULL;
         dev->set_mac_address = qeth_layer2_set_mac_address;
         dev->flags |= qeth_get_netdev_flags(card);
@@ -6477,6 +6479,9 @@ retry:
         /*network device will be recovered*/
         if (card->dev) {
                 card->dev->hard_header = card->orig_hard_header;
+                if (card->options.fake_ll &&
+                    (qeth_get_netdev_flags(card) & IFF_NOARP))
+                        card->dev->hard_header = qeth_fake_header;
                 return 0;
         }
         /* at first set_online allocate netdev */
@@ -6584,7 +6589,7 @@ qeth_setadpparms_change_macaddr_cb(struct qeth_card *card,
 
         cmd = (struct qeth_ipa_cmd *) data;
         if (!card->options.layer2 || card->info.guestlan ||
-            !(card->info.mac_bits & QETH_LAYER2_MAC_READ)) {    
+            !(card->info.mac_bits & QETH_LAYER2_MAC_READ)) {
                 memcpy(card->dev->dev_addr,
                        &cmd->data.setadapterparms.data.change_addr.addr,
                        OSA_ADDR_LEN);
@@ -7031,14 +7036,12 @@ qeth_softsetup_ipv6(struct qeth_card *card)
 
         QETH_DBF_TEXT(trace,3,"softipv6");
 
-        netif_stop_queue(card->dev);
         rc = qeth_send_startlan(card, QETH_PROT_IPV6);
         if (rc) {
                 PRINT_ERR("IPv6 startlan failed on %s\n",
                           QETH_CARD_IFNAME(card));
                 return rc;
         }
-        netif_wake_queue(card->dev);
         rc = qeth_query_ipassists(card,QETH_PROT_IPV6);
         if (rc) {
                 PRINT_ERR("IPv6 query ipassist failed on %s\n",
@@ -7352,7 +7355,8 @@ qeth_set_large_send(struct qeth_card *card, enum qeth_large_send_types type)
                 card->options.large_send = type;
                 return 0;
         }
-        netif_stop_queue(card->dev);
+        if (card->state == CARD_STATE_UP)
+                netif_tx_disable(card->dev);
         card->options.large_send = type;
         switch (card->options.large_send) {
         case QETH_LARGE_SEND_EDDP:
@@ -7374,7 +7378,8 @@ qeth_set_large_send(struct qeth_card *card, enum qeth_large_send_types type)
                 card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG);
                 break;
         }
-        netif_wake_queue(card->dev);
+        if (card->state == CARD_STATE_UP)
+                netif_wake_queue(card->dev);
         return rc;
 }
 
@@ -7427,7 +7432,7 @@ qeth_softsetup_card(struct qeth_card *card)
         if ((rc = qeth_setrouting_v6(card)))
                 QETH_DBF_TEXT_(setup, 2, "5err%d", rc);
 out:
-        netif_stop_queue(card->dev);
+        netif_tx_disable(card->dev);
         return 0;
 }
 
@@ -7567,7 +7572,7 @@ qeth_stop_card(struct qeth_card *card, int recovery_mode)
         if (card->read.state == CH_STATE_UP &&
             card->write.state == CH_STATE_UP &&
             (card->state == CARD_STATE_UP)) {
-                if (recovery_mode && 
+                if (recovery_mode &&
                     card->info.type != QETH_CARD_TYPE_OSN) {
                         qeth_stop(card->dev);
                 } else {
@@ -7736,10 +7741,8 @@ static int
 qeth_register_netdev(struct qeth_card *card)
 {
         QETH_DBF_TEXT(setup, 3, "regnetd");
-        if (card->dev->reg_state != NETREG_UNINITIALIZED) {
-                qeth_netdev_init(card->dev);
+        if (card->dev->reg_state != NETREG_UNINITIALIZED)
                 return 0;
-        }
         /* sysfs magic */
         SET_NETDEV_DEV(card->dev, &card->gdev->dev);
         return register_netdev(card->dev);
@@ -7750,7 +7753,7 @@ qeth_start_again(struct qeth_card *card, int recovery_mode)
 {
         QETH_DBF_TEXT(setup ,2, "startag");
 
-        if (recovery_mode && 
+        if (recovery_mode &&
             card->info.type != QETH_CARD_TYPE_OSN) {
                 qeth_open(card->dev);
         } else {