Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba1aa084 authored by Ursula Braun's avatar Ursula Braun Committed by Jeff Garzik
Browse files

[PATCH] s390: qeth driver fixes 



From: Frank Blaschka <Frank.Blaschka@de.ibm.com>
From: Frank Pavlic <fpavlic@de.ibm.com>

        - fix fake_ll during initial device bringup. fake_ll was
	  not active after first start of the device.
	  Problem only occured when qeth was built without IPV6 support.
        - avoid skb usage after invocation of qeth_flush_buffers,
	  because skb might already be freed.
        - remove yet another useless netif_wake_queue in
	  qeth_softsetup_ipv6 since this function is only called
	  when device is going online. In this case card->state will
	  never be in state UP. So let the net_device queue down .

Signed-off-by: default avatarFrank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b85e1fa1

drivers/s390/net/qeth_main.c

+13 −10
Original line number Diff line number Diff line
@@ -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);
@@ -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;

}
@@ -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");
@@ -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 */

	}
@@ -6370,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);
@@ -7031,14 +7036,12 @@ qeth_softsetup_ipv6(struct qeth_card *card) 


	QETH_DBF_TEXT(trace,3,"softipv6");



	netif_tx_disable(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",