projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86e0928
)
Bluetooth: l2cap: fix misuse of logical operation in place of bitop
author
David Sterba
<
[email protected]
>
Fri, 14 Jan 2011 13:59:44 +0000
(14:59 +0100)
committer
Gustavo F. Padovan
<
[email protected]
>
Wed, 19 Jan 2011 16:40:42 +0000
(14:40 -0200)
CC: Marcel Holtmann <
[email protected]
>
CC: "Gustavo F. Padovan" <
[email protected]
>
CC: João Paulo Rechi Vita <
[email protected]
>
Signed-off-by: David Sterba <
[email protected]
>
Signed-off-by: Gustavo F. Padovan <
[email protected]
>
net/bluetooth/l2cap.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap.c
b/net/bluetooth/l2cap.c
index c791fcda7b2d11bc4d2758701f1b200d73841f0c..4fd88eb0a46407fd1a5fde02e92f8ce9154d3492 100644
(file)
--- a/
net/bluetooth/l2cap.c
+++ b/
net/bluetooth/l2cap.c
@@
-1893,8
+1893,8
@@
static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
if (pi->mode == L2CAP_MODE_STREAMING) {
l2cap_streaming_send(sk);
} else {
- if (
pi->conn_state & L2CAP_CONN_REMOTE_BUSY
&&
-
pi->conn_state && L2CAP_CONN_WAIT_F
) {
+ if (
(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)
&&
+
(pi->conn_state & L2CAP_CONN_WAIT_F)
) {
err = len;
break;
}