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

Commit 9f7f78b4 authored by Alan Ott's avatar Alan Ott Committed by David S. Miller
Browse files

mac802154: Keep track of the channel when changed 



Two sections checked whether the current channel != the new channel
without ever setting the current channel variables.

1. net/mac802154/tx.c: Prevent set_channel() from getting called every
time a packet is sent.

2. net/mac802154/mib.c: Lock (pib_lock) accesses to current_channel and
current_page and make sure they are updated when the channel has been
changed.

Signed-off-by: default avatarAlan Ott <alan@signal11.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cbde8123

net/mac802154/mib.c

+11 −1
Original line number Diff line number Diff line
@@ -176,9 +176,15 @@ static void phy_chan_notify(struct work_struct *work) 
	struct mac802154_sub_if_data *priv = netdev_priv(nw->dev);

	int res;



	mutex_lock(&priv->hw->phy->pib_lock);

	res = hw->ops->set_channel(&hw->hw, priv->page, priv->chan);

	if (res)

		pr_debug("set_channel failed\n");

	else {

		priv->hw->phy->current_channel = priv->chan;

		priv->hw->phy->current_page = priv->page;

	}

	mutex_unlock(&priv->hw->phy->pib_lock);



	kfree(nw);

}
@@ -195,8 +201,11 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan) 
	priv->chan = chan;

	spin_unlock_bh(&priv->mib_lock);



	mutex_lock(&priv->hw->phy->pib_lock);

	if (priv->hw->phy->current_channel != priv->chan ||

	    priv->hw->phy->current_page != priv->page) {

		mutex_unlock(&priv->hw->phy->pib_lock);



		work = kzalloc(sizeof(*work), GFP_ATOMIC);

		if (!work)

			return;
@@ -204,5 +213,6 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan) 
		INIT_WORK(&work->work, phy_chan_notify);

		work->dev = dev;

		queue_work(priv->hw->dev_workqueue, &work->work);

	}

	} else

		mutex_unlock(&priv->hw->phy->pib_lock);

}

net/mac802154/tx.c

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ static void mac802154_xmit_worker(struct work_struct *work) 
			pr_debug("set_channel failed\n");

			goto out;

		}



		xw->priv->phy->current_channel = xw->chan;

		xw->priv->phy->current_page = xw->page;

	}



	res = xw->priv->ops->xmit(&xw->priv->hw, xw->skb);