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

Commit 987dafad authored by Baruch Siach's avatar Baruch Siach Committed by John W. Linville
Browse files

mac80211/mesh: make the preq queue lock consistent 



Make mesh_preq_queue_lock locking consistent with mesh_queue_preq() using
spin_lock_bh().

Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dfb72c4f

net/mac80211/mesh_hwmp.c

+3 −3
Original line number Diff line number Diff line
@@ -792,9 +792,9 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags) 
		return;

	}



	spin_lock(&ifmsh->mesh_preq_queue_lock);

	spin_lock_bh(&ifmsh->mesh_preq_queue_lock);

	if (ifmsh->preq_queue_len == MAX_PREQ_QUEUE_LEN) {

		spin_unlock(&ifmsh->mesh_preq_queue_lock);

		spin_unlock_bh(&ifmsh->mesh_preq_queue_lock);

		kfree(preq_node);

		if (printk_ratelimit())

			mhwmp_dbg("PREQ node queue full\n");
@@ -806,7 +806,7 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags) 


	list_add_tail(&preq_node->list, &ifmsh->preq_queue.list);

	++ifmsh->preq_queue_len;

	spin_unlock(&ifmsh->mesh_preq_queue_lock);

	spin_unlock_bh(&ifmsh->mesh_preq_queue_lock);



	if (time_after(jiffies, ifmsh->last_preq + min_preq_int_jiff(sdata)))

		ieee80211_queue_work(&sdata->local->hw, &sdata->work);