diff options
author | David Vrabel <david.vrabel@csr.com> | 2008-10-27 11:10:14 -0400 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2008-10-28 07:57:02 -0400 |
commit | 6a4b58707903cb0901966ac8dad5d6ec7f2d432f (patch) | |
tree | 7fef13054c1cfbb57774b04f99f1d1d8a2b1233f /drivers/uwb/rsv.c | |
parent | f8d56f1771e4867acc461146764b4feeb5245669 (diff) |
uwb: target reservations shouldn't get streams
The reservation owner should decide the stream index to use based on
what reservations it's created.
Signed-off-by: David Vrabel <david.vrabel@csr.com>
Diffstat (limited to 'drivers/uwb/rsv.c')
-rw-r--r-- | drivers/uwb/rsv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c index bae16204576d..e4facae46e0d 100644 --- a/drivers/uwb/rsv.c +++ b/drivers/uwb/rsv.c | |||
@@ -285,7 +285,8 @@ void uwb_rsv_set_state(struct uwb_rsv *rsv, enum uwb_rsv_state new_state) | |||
285 | switch (new_state) { | 285 | switch (new_state) { |
286 | case UWB_RSV_STATE_NONE: | 286 | case UWB_RSV_STATE_NONE: |
287 | uwb_drp_avail_release(rsv->rc, &rsv->mas); | 287 | uwb_drp_avail_release(rsv->rc, &rsv->mas); |
288 | uwb_rsv_put_stream(rsv); | 288 | if (uwb_rsv_is_owner(rsv)) |
289 | uwb_rsv_put_stream(rsv); | ||
289 | uwb_rsv_state_update(rsv, UWB_RSV_STATE_NONE); | 290 | uwb_rsv_state_update(rsv, UWB_RSV_STATE_NONE); |
290 | uwb_rsv_callback(rsv); | 291 | uwb_rsv_callback(rsv); |
291 | break; | 292 | break; |
@@ -532,7 +533,6 @@ static struct uwb_rsv *uwb_rsv_new_target(struct uwb_rc *rc, | |||
532 | rsv->target.dev = &rc->uwb_dev; | 533 | rsv->target.dev = &rc->uwb_dev; |
533 | rsv->type = uwb_ie_drp_type(drp_ie); | 534 | rsv->type = uwb_ie_drp_type(drp_ie); |
534 | rsv->stream = uwb_ie_drp_stream_index(drp_ie); | 535 | rsv->stream = uwb_ie_drp_stream_index(drp_ie); |
535 | set_bit(rsv->stream, rsv->owner->streams); | ||
536 | uwb_drp_ie_to_bm(&rsv->mas, drp_ie); | 536 | uwb_drp_ie_to_bm(&rsv->mas, drp_ie); |
537 | 537 | ||
538 | /* | 538 | /* |