diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-06 13:55:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-06 13:55:42 -0500 |
| commit | 5f9251cb93237c9578160df9acc6ce9948ad8c52 (patch) | |
| tree | 5a5718b5a076ce6f04bb3d0e1691aa65d87cc8a8 /include/net/bluetooth/bluetooth.h | |
| parent | 2c6607c611cb7bf0a6750bcea34a258144e302c5 (diff) | |
| parent | 06778b1c383afbdb88ffd837e117bec06a76f450 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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 d81ea7997701..0c5e72503b77 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h | |||
| @@ -144,6 +144,7 @@ struct bt_skb_cb { | |||
| 144 | __u8 tx_seq; | 144 | __u8 tx_seq; |
| 145 | __u8 retries; | 145 | __u8 retries; |
| 146 | __u8 sar; | 146 | __u8 sar; |
| 147 | unsigned short channel; | ||
| 147 | }; | 148 | }; |
| 148 | #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb)) | 149 | #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb)) |
| 149 | 150 | ||