diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-05-01 15:15:41 -0400 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 03:28:50 -0400 |
| commit | 803020c6fa63aa738cfda3329c9675b42023e9d2 (patch) | |
| tree | 4fbe8adc8319193624931a2710bf5e46c541852f /include/net/bluetooth | |
| parent | 14b5aa71ec506f4e38ca6a1dc02ecd668ecfd902 (diff) | |
Bluetooth: Change acknowledgement to use the value of txWindow
Now that we can set the txWindow we need to change the acknowledgement
procedure to ack after each (pi->txWindow/6 + 1). The plus 1 is to avoid
the zero value.
It also renames pi->num_to_ack to a better name: pi->num_acked.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net/bluetooth')
| -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 07ae4ccfffbd..059260bed4e8 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #define L2CAP_DEFAULT_MIN_MTU 48 | 30 | #define L2CAP_DEFAULT_MIN_MTU 48 |
| 31 | #define L2CAP_DEFAULT_FLUSH_TO 0xffff | 31 | #define L2CAP_DEFAULT_FLUSH_TO 0xffff |
| 32 | #define L2CAP_DEFAULT_TX_WINDOW 63 | 32 | #define L2CAP_DEFAULT_TX_WINDOW 63 |
| 33 | #define L2CAP_DEFAULT_NUM_TO_ACK (L2CAP_DEFAULT_TX_WINDOW/5) | ||
| 34 | #define L2CAP_DEFAULT_MAX_TX 3 | 33 | #define L2CAP_DEFAULT_MAX_TX 3 |
| 35 | #define L2CAP_DEFAULT_RETRANS_TO 1000 /* 1 second */ | 34 | #define L2CAP_DEFAULT_RETRANS_TO 1000 /* 1 second */ |
| 36 | #define L2CAP_DEFAULT_MONITOR_TO 12000 /* 12 seconds */ | 35 | #define L2CAP_DEFAULT_MONITOR_TO 12000 /* 12 seconds */ |
| @@ -333,7 +332,7 @@ struct l2cap_pinfo { | |||
| 333 | __u8 frames_sent; | 332 | __u8 frames_sent; |
| 334 | __u8 unacked_frames; | 333 | __u8 unacked_frames; |
| 335 | __u8 retry_count; | 334 | __u8 retry_count; |
| 336 | __u8 num_to_ack; | 335 | __u8 num_acked; |
| 337 | __u16 sdu_len; | 336 | __u16 sdu_len; |
| 338 | __u16 partial_sdu_len; | 337 | __u16 partial_sdu_len; |
| 339 | struct sk_buff *sdu; | 338 | struct sk_buff *sdu; |
