diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-10-04 14:06:47 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-04 14:06:47 -0400 |
| commit | d6222fb0d669307a49e2a96aad86c156a9bb9551 (patch) | |
| tree | 99c821e5823999b99e7fd49fb840d18cbb89b238 /include/net | |
| parent | 76ed94be65c8bd80b565865c186dd9f24bb2f23b (diff) | |
| parent | c510eae377c773241ff0b6369a8f3581da941a51 (diff) | |
| download | linux-3.10-d6222fb0d669307a49e2a96aad86c156a9bb9551.tar.gz linux-3.10-d6222fb0d669307a49e2a96aad86c156a9bb9551.tar.bz2 linux-3.10-d6222fb0d669307a49e2a96aad86c156a9bb9551.zip | |
Merge branch 'master' of git://github.com/padovan/bluetooth-next
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 7f878b9d564..ab90ae0970a 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -354,8 +354,8 @@ struct l2cap_chan { __u8 retry_count; __u8 num_acked; __u16 sdu_len; - __u16 partial_sdu_len; struct sk_buff *sdu; + struct sk_buff *sdu_last_frag; __u8 remote_tx_win; __u8 remote_max_tx; @@ -448,7 +448,6 @@ enum { #define L2CAP_CONF_MAX_CONF_RSP 2 enum { - CONN_SAR_SDU, CONN_SREJ_SENT, CONN_WAIT_F, CONN_SREJ_ACT, |