diff options
Diffstat (limited to 'drivers/uwb/drp-ie.c')
| -rw-r--r-- | drivers/uwb/drp-ie.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/uwb/drp-ie.c b/drivers/uwb/drp-ie.c index b7d4f6b75eef..1d2a939cfcf8 100644 --- a/drivers/uwb/drp-ie.c +++ b/drivers/uwb/drp-ie.c @@ -128,9 +128,8 @@ static struct uwb_ie_drp *uwb_drp_ie_alloc(void) drp_ie = kzalloc(sizeof(struct uwb_ie_drp) + UWB_NUM_ZONES * sizeof(struct uwb_drp_alloc), GFP_KERNEL); - if (drp_ie) { + if (drp_ie) drp_ie->hdr.element_id = UWB_IE_DRP; - } return drp_ie; } @@ -199,7 +198,7 @@ int uwb_drp_ie_update(struct uwb_rsv *rsv) rsv->drp_ie = NULL; return 0; } - + unsafe = rsv->mas.unsafe ? 1 : 0; if (rsv->drp_ie == NULL) { @@ -232,23 +231,23 @@ int uwb_drp_ie_update(struct uwb_rsv *rsv) uwb_drp_ie_from_bm(drp_ie, &rsv->mas); if (uwb_rsv_has_two_drp_ies(rsv)) { - mv = &rsv->mv; + mv = &rsv->mv; if (mv->companion_drp_ie == NULL) { mv->companion_drp_ie = uwb_drp_ie_alloc(); if (mv->companion_drp_ie == NULL) return -ENOMEM; } drp_ie = mv->companion_drp_ie; - + /* keep all the same configuration of the main drp_ie */ memcpy(drp_ie, rsv->drp_ie, sizeof(struct uwb_ie_drp)); - + /* FIXME: handle properly the unsafe bit */ uwb_ie_drp_set_unsafe(drp_ie, 1); uwb_ie_drp_set_status(drp_ie, uwb_rsv_companion_status(rsv)); uwb_ie_drp_set_reason_code(drp_ie, uwb_rsv_companion_reason_code(rsv)); - + uwb_drp_ie_from_bm(drp_ie, &mv->companion_mas); } |