git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[pandora-kernel.git]
/
net
/
bluetooth
/
l2cap_core.c
diff --git
a/net/bluetooth/l2cap_core.c
b/net/bluetooth/l2cap_core.c
index
8cd1291
..
5ea94a1
100644
(file)
--- a/
net/bluetooth/l2cap_core.c
+++ b/
net/bluetooth/l2cap_core.c
@@
-251,7
+251,7
@@
static void l2cap_chan_timeout(unsigned long arg)
if (sock_owned_by_user(sk)) {
/* sk is owned by user. Try again later */
if (sock_owned_by_user(sk)) {
/* sk is owned by user. Try again later */
- __set_chan_timer(chan,
HZ / 5
);
+ __set_chan_timer(chan,
L2CAP_DISC_TIMEOUT
);
bh_unlock_sock(sk);
chan_put(chan);
return;
bh_unlock_sock(sk);
chan_put(chan);
return;
@@
-2488,7
+2488,7
@@
static inline int l2cap_connect_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hd
if (sock_owned_by_user(sk)) {
l2cap_state_change(chan, BT_DISCONN);
__clear_chan_timer(chan);
if (sock_owned_by_user(sk)) {
l2cap_state_change(chan, BT_DISCONN);
__clear_chan_timer(chan);
- __set_chan_timer(chan,
HZ / 5
);
+ __set_chan_timer(chan,
L2CAP_DISC_TIMEOUT
);
break;
}
break;
}
@@
-2661,7
+2661,7
@@
static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
default:
sk->sk_err = ECONNRESET;
default:
sk->sk_err = ECONNRESET;
- __set_chan_timer(chan,
HZ * 5
);
+ __set_chan_timer(chan,
L2CAP_DISC_REJ_TIMEOUT
);
l2cap_send_disconn_req(conn, chan, ECONNRESET);
goto done;
}
l2cap_send_disconn_req(conn, chan, ECONNRESET);
goto done;
}
@@
-2718,7
+2718,7
@@
static inline int l2cap_disconnect_req(struct l2cap_conn *conn, struct l2cap_cmd
if (sock_owned_by_user(sk)) {
l2cap_state_change(chan, BT_DISCONN);
__clear_chan_timer(chan);
if (sock_owned_by_user(sk)) {
l2cap_state_change(chan, BT_DISCONN);
__clear_chan_timer(chan);
- __set_chan_timer(chan,
HZ / 5
);
+ __set_chan_timer(chan,
L2CAP_DISC_TIMEOUT
);
bh_unlock_sock(sk);
return 0;
}
bh_unlock_sock(sk);
return 0;
}
@@
-2752,7
+2752,7
@@
static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, struct l2cap_cmd
if (sock_owned_by_user(sk)) {
l2cap_state_change(chan,BT_DISCONN);
__clear_chan_timer(chan);
if (sock_owned_by_user(sk)) {
l2cap_state_change(chan,BT_DISCONN);
__clear_chan_timer(chan);
- __set_chan_timer(chan,
HZ / 5
);
+ __set_chan_timer(chan,
L2CAP_DISC_TIMEOUT
);
bh_unlock_sock(sk);
return 0;
}
bh_unlock_sock(sk);
return 0;
}
@@
-3998,7
+3998,7
@@
static inline void l2cap_check_encryption(struct l2cap_chan *chan, u8 encrypt)
if (encrypt == 0x00) {
if (chan->sec_level == BT_SECURITY_MEDIUM) {
__clear_chan_timer(chan);
if (encrypt == 0x00) {
if (chan->sec_level == BT_SECURITY_MEDIUM) {
__clear_chan_timer(chan);
- __set_chan_timer(chan,
HZ * 5
);
+ __set_chan_timer(chan,
L2CAP_ENC_TIMEOUT
);
} else if (chan->sec_level == BT_SECURITY_HIGH)
l2cap_chan_close(chan, ECONNREFUSED);
} else {
} else if (chan->sec_level == BT_SECURITY_HIGH)
l2cap_chan_close(chan, ECONNREFUSED);
} else {
@@
-4066,7
+4066,7
@@
static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
L2CAP_CONN_REQ, sizeof(req), &req);
} else {
__clear_chan_timer(chan);
L2CAP_CONN_REQ, sizeof(req), &req);
} else {
__clear_chan_timer(chan);
- __set_chan_timer(chan,
HZ / 10
);
+ __set_chan_timer(chan,
L2CAP_DISC_TIMEOUT
);
}
} else if (chan->state == BT_CONNECT2) {
struct l2cap_conn_rsp rsp;
}
} else if (chan->state == BT_CONNECT2) {
struct l2cap_conn_rsp rsp;
@@
-4086,7
+4086,7
@@
static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
}
} else {
l2cap_state_change(chan, BT_DISCONN);
}
} else {
l2cap_state_change(chan, BT_DISCONN);
- __set_chan_timer(chan,
HZ / 10
);
+ __set_chan_timer(chan,
L2CAP_DISC_TIMEOUT
);
res = L2CAP_CR_SEC_BLOCK;
stat = L2CAP_CS_NO_INFO;
}
res = L2CAP_CR_SEC_BLOCK;
stat = L2CAP_CS_NO_INFO;
}