← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to net/bluetooth/hci_conn.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Upstream Kernel Changes
  • Date: 2012-03-27 17:01:30 UTC
  • Revision ID: package-import@ubuntu.com-20120327170130-qrvi60snnxty6ibi
Tags: 3.2.0-1411.14
https://launchpad.net/bugs/963512
[ Paolo Pisati ]

* Revert to Ubuntu-3.2.0-1409.12 until we figure out what's wrong with hdmi
  - LP: #963512

[ Upstream Kernel Changes ]

* Revert "Reapply upleveled PMU interrupt patch"
* KBuild: Allow scripts/* to be cross compiled
* LINARO: Use KBUILD_SCRIPTROOT to cross build scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/bluetooth/hci_conn.c
608
608
 
609
609
        if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {
610
610
                struct hci_cp_auth_requested cp;
611
 
 
612
 
                /* encrypt must be pending if auth is also pending */
613
 
                set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend);
614
 
 
615
611
                cp.handle = cpu_to_le16(conn->handle);
616
612
                hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED,
617
613
                                                        sizeof(cp), &cp);