← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to net/bluetooth/sco.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/bluetooth/sco.c
369
369
 
370
370
        case BT_CONNECTED:
371
371
        case BT_CONFIG:
 
372
                if (sco_pi(sk)->conn) {
 
373
                        sk->sk_state = BT_DISCONN;
 
374
                        sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT);
 
375
                        hci_conn_put(sco_pi(sk)->conn->hcon);
 
376
                        sco_pi(sk)->conn->hcon = NULL;
 
377
                } else
 
378
                        sco_chan_del(sk, ECONNRESET);
 
379
                break;
 
380
 
372
381
        case BT_CONNECT:
373
382
        case BT_DISCONN:
374
383
                sco_chan_del(sk, ECONNRESET);
819
828
                conn->sk = NULL;
820
829
                sco_pi(sk)->conn = NULL;
821
830
                sco_conn_unlock(conn);
822
 
                hci_conn_put(conn->hcon);
 
831
 
 
832
                if (conn->hcon)
 
833
                        hci_conn_put(conn->hcon);
823
834
        }
824
835
 
825
836
        sk->sk_state = BT_CLOSED;