diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-01-04 14:25:28 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-01-04 14:25:28 -0500 |
commit | 782a9e31e81956a271375c0ba8d46fbb0480983e (patch) | |
tree | 0db1e951862111d3ea44fdcedeaee6ea55821165 /include/net/bluetooth/bluetooth.h | |
parent | 5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a (diff) | |
parent | 17f9cc3124c97f50a19a7597e5f29f915b5b835c (diff) | |
download | kernel_samsung_crespo-782a9e31e81956a271375c0ba8d46fbb0480983e.zip kernel_samsung_crespo-782a9e31e81956a271375c0ba8d46fbb0480983e.tar.gz kernel_samsung_crespo-782a9e31e81956a271375c0ba8d46fbb0480983e.tar.bz2 |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'include/net/bluetooth/bluetooth.h')
-rw-r--r-- | include/net/bluetooth/bluetooth.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index d81ea79..0c5e725 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -144,6 +144,7 @@ struct bt_skb_cb { __u8 tx_seq; __u8 retries; __u8 sar; + unsigned short channel; }; #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb)) |