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

Commit cd09ab09 authored by Samuel Mendoza-Jonas's avatar Samuel Mendoza-Jonas Committed by David S. Miller
Browse files

net/ncsi: Don't deselect package in suspend if active 



When a package is deselected all channels of that package cease
communication. If there are other channels active on the package of the
suspended channel this will disable them as well, so only send a
deselect-package command if no other channels are active.

Signed-off-by: default avatarSamuel Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e13f70b

net/ncsi/ncsi-manage.c

+13 −2
Original line number Diff line number Diff line
@@ -440,12 +440,14 @@ static void ncsi_request_timeout(struct timer_list *t) 
static void ncsi_suspend_channel(struct ncsi_dev_priv *ndp)

{

	struct ncsi_dev *nd = &ndp->ndev;

	struct ncsi_package *np = ndp->active_package;

	struct ncsi_channel *nc = ndp->active_channel;

	struct ncsi_package *np;

	struct ncsi_channel *nc, *tmp;

	struct ncsi_cmd_arg nca;

	unsigned long flags;

	int ret;



	np = ndp->active_package;

	nc = ndp->active_channel;

	nca.ndp = ndp;

	nca.req_flags = NCSI_REQ_FLAG_EVENT_DRIVEN;

	switch (nd->state) {
@@ -521,6 +523,15 @@ static void ncsi_suspend_channel(struct ncsi_dev_priv *ndp) 
		if (ret)

			goto error;



		NCSI_FOR_EACH_CHANNEL(np, tmp) {

			/* If there is another channel active on this package

			 * do not deselect the package.

			 */

			if (tmp != nc && tmp->state == NCSI_CHANNEL_ACTIVE) {

				nd->state = ncsi_dev_state_suspend_done;

				break;

			}

		}

		break;

	case ncsi_dev_state_suspend_deselect:

		ndp->pending_req_num = 1;