diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-05-24 16:54:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-24 16:54:12 -0700 |
| commit | c883f215a23a9352097b8d17fb8dae22ff134a14 (patch) | |
| tree | 607367ed52095d915e7dc0ff941046cf623bda0b /include | |
| parent | 1ff75ed254bdbb47bb0c1d71a3cc65f6831a8e3a (diff) | |
| parent | 5dee9e7c4c869fcffccc3d432b755793dfa71376 (diff) | |
| download | linux-stable-c883f215a23a9352097b8d17fb8dae22ff134a14.tar.gz linux-stable-c883f215a23a9352097b8d17fb8dae22ff134a14.tar.bz2 linux-stable-c883f215a23a9352097b8d17fb8dae22ff134a14.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 8242a0ee1f58..87df4e87622d 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -129,8 +129,10 @@ struct l2cap_conf_rsp { __u8 data[0]; } __attribute__ ((packed)); -#define L2CAP_CONF_SUCCESS 0x00 -#define L2CAP_CONF_UNACCEPT 0x01 +#define L2CAP_CONF_SUCCESS 0x0000 +#define L2CAP_CONF_UNACCEPT 0x0001 +#define L2CAP_CONF_REJECT 0x0002 +#define L2CAP_CONF_UNKNOWN 0x0003 struct l2cap_conf_opt { __u8 type; @@ -215,6 +217,8 @@ struct l2cap_pinfo { __u32 link_mode; + __u8 conf_req[64]; + __u8 conf_len; __u8 conf_state; __u8 conf_retry; __u16 conf_mtu; |