Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bluetooth: Remove redundant RFCOMM BT_CLOSED settings

Browse source 
rfcomm_session_close() sets the RFCOMM session state to BT_CLOSED.
However, in multiple places immediately before the function is
called, the RFCOMM session is set to BT_CLOSED. Therefore,
remove these unnecessary state settings.

Signed-off-by: Dean Jenkins <Dean_Jenkins@mentor.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
Dean Jenkins 2013-02-28 14:21:58 +00:00 committed by Gustavo Padovan
parent 8e888f2783
commit 24fd642ccb
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/bluetooth/rfcomm/core.c
View file

@ -659,10 +659,10 @@ static struct rfcomm_session *rfcomm_session_close(struct rfcomm_session *s,
struct rfcomm_dlc *d; struct rfcomm_dlc *d;
struct list_head *p, *n; struct list_head *p, *n;
BT_DBG("session %p state %ld err %d", s, s->state, err);
s->state = BT_CLOSED; s->state = BT_CLOSED;
BT_DBG("session %p state %ld err %d", s, s->state, err);
/* Close all dlcs */ /* Close all dlcs */
list_for_each_safe(p, n, &s->dlcs) { list_for_each_safe(p, n, &s->dlcs) {
d = list_entry(p, struct rfcomm_dlc, list); d = list_entry(p, struct rfcomm_dlc, list);
@ -1188,7 +1188,6 @@ static struct rfcomm_session *rfcomm_recv_dm(struct rfcomm_session *s, u8 dlci)
else else
err = ECONNRESET; err = ECONNRESET;
s->state = BT_CLOSED;
s = rfcomm_session_close(s, err); s = rfcomm_session_close(s, err);
} }
return s; return s;
@ -1224,7 +1223,6 @@ static struct rfcomm_session *rfcomm_recv_disc(struct rfcomm_session *s,
else else
err = ECONNRESET; err = ECONNRESET;
s->state = BT_CLOSED;
s = rfcomm_session_close(s, err); s = rfcomm_session_close(s, err);
} }
return s; return s;
@ -1921,7 +1919,6 @@ static struct rfcomm_session *rfcomm_check_connection(struct rfcomm_session *s)
break; break;
case BT_CLOSED: case BT_CLOSED:
s->state = BT_CLOSED;
s = rfcomm_session_close(s, sk->sk_err); s = rfcomm_session_close(s, sk->sk_err);
break; break;
} }