diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-02 08:08:43 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-02 08:08:47 -0400 |
| commit | aff364860aa105b2deacc6f21ec8ef524460e3fc (patch) | |
| tree | 18409ebe16b25b141598da9b6386d69416c06afa /net/bluetooth/l2cap_core.c | |
| parent | c7a7b814c9dca9ee01b38e63b4a46de87156d3b6 (diff) | |
| parent | 993ba1585cbb03fab012e41d1a5d24330a283b31 (diff) | |
Merge branch 'x86/numa' into x86-mm
Merge reason: Pick up x86-32 remap allocator cleanup changes - 14
commits, 3fe14ab541^..993ba1585c.
3fe14ab541: x86-32, numa: Fix failure condition check in alloc_remap()
993ba1585c: x86-32, numa: Update remap allocator comments
Scheduled NUMA init 32/64bit unification changes depend on them.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index c9f9cecca52..ca27f3a4153 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
| @@ -1116,7 +1116,9 @@ int l2cap_ertm_send(struct sock *sk) | |||
| 1116 | bt_cb(skb)->tx_seq = pi->next_tx_seq; | 1116 | bt_cb(skb)->tx_seq = pi->next_tx_seq; |
| 1117 | pi->next_tx_seq = (pi->next_tx_seq + 1) % 64; | 1117 | pi->next_tx_seq = (pi->next_tx_seq + 1) % 64; |
| 1118 | 1118 | ||
| 1119 | pi->unacked_frames++; | 1119 | if (bt_cb(skb)->retries == 1) |
| 1120 | pi->unacked_frames++; | ||
| 1121 | |||
| 1120 | pi->frames_sent++; | 1122 | pi->frames_sent++; |
| 1121 | 1123 | ||
| 1122 | if (skb_queue_is_last(TX_QUEUE(sk), skb)) | 1124 | if (skb_queue_is_last(TX_QUEUE(sk), skb)) |