diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-09 16:02:51 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-09 17:24:26 +0200 |
| commit | 73f828cce2d2f7ceed92dd9ab584b4301b53f822 (patch) | |
| tree | d0cbcfce8153c544dee18aa105c2059c20f9b4bd /plugins | |
| parent | 6e5d3d78fcb2db8e4b502285879acc65fc983ea4 (diff) | |
adapter_opts: Add address type to block() and unblock()
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/hciops.c | 4 | ||||
| -rw-r--r-- | plugins/mgmtops.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/hciops.c b/plugins/hciops.c index f583e8cc..ee73c45f 100644 --- a/plugins/hciops.c +++ b/plugins/hciops.c @@ -3307,7 +3307,7 @@ static int hciops_read_bdaddr(int index, bdaddr_t *bdaddr) return 0; } -static int hciops_block_device(int index, bdaddr_t *bdaddr) +static int hciops_block_device(int index, bdaddr_t *bdaddr, addr_type_t type) { struct dev_info *dev = &devs[index]; char addr[18]; @@ -3321,7 +3321,7 @@ static int hciops_block_device(int index, bdaddr_t *bdaddr) return 0; } -static int hciops_unblock_device(int index, bdaddr_t *bdaddr) +static int hciops_unblock_device(int index, bdaddr_t *bdaddr, addr_type_t type) { struct dev_info *dev = &devs[index]; char addr[18]; diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c index bcb23d50..6b99e085 100644 --- a/plugins/mgmtops.c +++ b/plugins/mgmtops.c @@ -1759,7 +1759,7 @@ static int mgmt_read_bdaddr(int index, bdaddr_t *bdaddr) return 0; } -static int mgmt_block_device(int index, bdaddr_t *bdaddr) +static int mgmt_block_device(int index, bdaddr_t *bdaddr, addr_type_t type) { char buf[MGMT_HDR_SIZE + sizeof(struct mgmt_cp_block_device)]; struct mgmt_hdr *hdr = (void *) buf; @@ -1778,6 +1778,7 @@ static int mgmt_block_device(int index, bdaddr_t *bdaddr) cp = (void *) &buf[sizeof(*hdr)]; bacpy(&cp->addr.bdaddr, bdaddr); + cp->addr.type = mgmt_addr_type(type); buf_len = sizeof(*hdr) + sizeof(*cp); @@ -1787,7 +1788,7 @@ static int mgmt_block_device(int index, bdaddr_t *bdaddr) return 0; } -static int mgmt_unblock_device(int index, bdaddr_t *bdaddr) +static int mgmt_unblock_device(int index, bdaddr_t *bdaddr, addr_type_t type) { char buf[MGMT_HDR_SIZE + sizeof(struct mgmt_cp_unblock_device)]; struct mgmt_hdr *hdr = (void *) buf; @@ -1806,6 +1807,7 @@ static int mgmt_unblock_device(int index, bdaddr_t *bdaddr) cp = (void *) &buf[sizeof(*hdr)]; bacpy(&cp->addr.bdaddr, bdaddr); + cp->addr.type = mgmt_addr_type(type); buf_len = sizeof(*hdr) + sizeof(*cp); |