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

Commit 1959031e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-qeth-fixes' 



Julian Wiedmann says:

====================
s390/qeth: fixes 2018-03-20

Please apply one final set of qeth patches for 4.16.
All of these fix long-standing bugs, so please queue them up for -stable
as well.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3d21ac6f a6c3d939

drivers/s390/net/qeth_core_main.c

+15 −6
Original line number Diff line number Diff line
@@ -527,8 +527,7 @@ static inline int qeth_is_cq(struct qeth_card *card, unsigned int queue) 
	    queue == card->qdio.no_in_queues - 1;

}





static int qeth_issue_next_read(struct qeth_card *card)

static int __qeth_issue_next_read(struct qeth_card *card)

{

	int rc;

	struct qeth_cmd_buffer *iob;
@@ -559,6 +558,17 @@ static int qeth_issue_next_read(struct qeth_card *card) 
	return rc;

}



static int qeth_issue_next_read(struct qeth_card *card)

{

	int ret;



	spin_lock_irq(get_ccwdev_lock(CARD_RDEV(card)));

	ret = __qeth_issue_next_read(card);

	spin_unlock_irq(get_ccwdev_lock(CARD_RDEV(card)));



	return ret;

}



static struct qeth_reply *qeth_alloc_reply(struct qeth_card *card)

{

	struct qeth_reply *reply;
@@ -960,7 +970,7 @@ void qeth_clear_thread_running_bit(struct qeth_card *card, unsigned long thread) 
	spin_lock_irqsave(&card->thread_mask_lock, flags);

	card->thread_running_mask &= ~thread;

	spin_unlock_irqrestore(&card->thread_mask_lock, flags);

	wake_up(&card->wait_q);

	wake_up_all(&card->wait_q);

}

EXPORT_SYMBOL_GPL(qeth_clear_thread_running_bit);
@@ -1164,6 +1174,7 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm, 
		}

		rc = qeth_get_problem(cdev, irb);

		if (rc) {

			card->read_or_write_problem = 1;

			qeth_clear_ipacmd_list(card);

			qeth_schedule_recovery(card);

			goto out;
@@ -1182,7 +1193,7 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm, 
		return;

	if (channel == &card->read &&

	    channel->state == CH_STATE_UP)

		qeth_issue_next_read(card);

		__qeth_issue_next_read(card);



	iob = channel->iob;

	index = channel->buf_no;
@@ -5087,8 +5098,6 @@ static void qeth_core_free_card(struct qeth_card *card) 
	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));

	qeth_clean_channel(&card->read);

	qeth_clean_channel(&card->write);

	if (card->dev)

		free_netdev(card->dev);

	qeth_free_qdio_buffers(card);

	unregister_service_level(&card->qeth_service_level);

	kfree(card);

drivers/s390/net/qeth_l2_main.c

+1 −1
Original line number Diff line number Diff line
@@ -915,8 +915,8 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev) 
		qeth_l2_set_offline(cgdev);



	if (card->dev) {

		netif_napi_del(&card->napi);

		unregister_netdev(card->dev);

		free_netdev(card->dev);

		card->dev = NULL;

	}

	return;

drivers/s390/net/qeth_l3_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2865,8 +2865,8 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev) 
		qeth_l3_set_offline(cgdev);



	if (card->dev) {

		netif_napi_del(&card->napi);

		unregister_netdev(card->dev);

		free_netdev(card->dev);

		card->dev = NULL;

	}