Commit 1fc671b3 authored Dec 20, 2013 by Thomas Pugliese Committed by Greg Kroah-Hartman Dec 20, 2013

uwb: move mutex_lock to error case in uwbd_evt_handle_rc_bp_slot_change

Only acquire rc->uwb_dev.mutex in the error case in
uwbd_evt_handle_rc_bp_slot_change. This fixes a bug where establishing
a reservation on a new channel will fail if we were unable to establish
a reservation on the previous channel due to DRP conflict.

If rc->uwb_dev.mutex is acquired in the non-error case when the uwb
system is attempting to start beaconing, it will block because the start
beaconing code is holding this mutex. This prevents any other
notifications from the URC from being processed. In particular, the
DRP_AVAILABILITY notification will not be processed during the start
beaconing process which can result in a failure to establish a
reservation. It is safe to not hold the mutex in the non-error
case since the only other place rc->uwb_dev.beacon_slot is accessed is
in the same worker thread that uwbd_evt_handle_rc_bp_slot_change
executes in.

Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent bf359dff

drivers/uwb/beacon.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -516,13 +516,13 @@ int uwbd_evt_handle_rc_bp_slot_change(struct uwb_event *evt)
		}
		bpsc = container_of(evt->notif.rceb, struct uwb_rc_evt_bp_slot_change, rceb);

		mutex_lock(&rc->uwb_dev.mutex);
		if (uwb_rc_evt_bp_slot_change_no_slot(bpsc)) {
		dev_err(dev, "stopped beaconing: No free slots in BP\n");
		mutex_lock(&rc->uwb_dev.mutex);
		rc->beaconing = -1;
		mutex_unlock(&rc->uwb_dev.mutex);
		} else
		rc->uwb_dev.beacon_slot = uwb_rc_evt_bp_slot_change_slot_num(bpsc);
		mutex_unlock(&rc->uwb_dev.mutex);

		return 0;
		}

Admin message