diff for duplicates of <20120814190245.GA22136@tuxdriver.com> diff --git a/a/1.txt b/N1/1.txt index ae740a3..8f53562 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -451,27 +451,3 @@ index 40bbe25..3589e21 100644 - if (conn->hcon) - hci_conn_put(conn->hcon); - } -- - sk->sk_state = BT_CLOSED; - sk->sk_err = err; - sk->sk_state_change(sk); -diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c -index 16ef0dc..901a616 100644 ---- a/net/bluetooth/smp.c -+++ b/net/bluetooth/smp.c -@@ -579,8 +579,11 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb) - - if (!test_and_set_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags)) - smp = smp_chan_create(conn); -+ else -+ smp = conn->smp_chan; - -- smp = conn->smp_chan; -+ if (!smp) -+ return SMP_UNSPECIFIED; - - smp->preq[0] = SMP_CMD_PAIRING_REQ; - memcpy(&smp->preq[1], req, sizeof(*req)); --- -John W. Linville Someday the world will need a hero, and you -linville@tuxdriver.com might be all we have. Be ready. diff --git a/a/content_digest b/N1/content_digest index 9e835a0..fe8684e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,10 @@ - "From\0John W. Linville <linville@tuxdriver.com>\0" + "From\0John W. Linville <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>\0" "Subject\0pull request: wireless 2012-08-14\0" "Date\0Tue, 14 Aug 2012 15:02:46 -0400\0" - "To\0davem@davemloft.net\0" - "Cc\0linux-wireless@vger.kernel.org" - netdev@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + "To\0davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\0" + "Cc\0linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "commit 1e55217e174f4e6920fd441dcd3aaf8e37645460\n" @@ -459,30 +459,6 @@ "-\n" "-\t\tif (conn->hcon)\n" "-\t\t\thci_conn_put(conn->hcon);\n" - "-\t}\n" - "-\n" - " \tsk->sk_state = BT_CLOSED;\n" - " \tsk->sk_err = err;\n" - " \tsk->sk_state_change(sk);\n" - "diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c\n" - "index 16ef0dc..901a616 100644\n" - "--- a/net/bluetooth/smp.c\n" - "+++ b/net/bluetooth/smp.c\n" - "@@ -579,8 +579,11 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)\n" - " \n" - " \tif (!test_and_set_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags))\n" - " \t\tsmp = smp_chan_create(conn);\n" - "+\telse\n" - "+\t\tsmp = conn->smp_chan;\n" - " \n" - "-\tsmp = conn->smp_chan;\n" - "+\tif (!smp)\n" - "+\t\treturn SMP_UNSPECIFIED;\n" - " \n" - " \tsmp->preq[0] = SMP_CMD_PAIRING_REQ;\n" - " \tmemcpy(&smp->preq[1], req, sizeof(*req));\n" - "-- \n" - "John W. Linville\t\tSomeday the world will need a hero, and you\n" - "linville@tuxdriver.com\t\t\tmight be all we have. Be ready." + "-\t}" -8f116e2e15397bcb82f66e62c648b8a7b6b92758055b7d93975954ee22010741 +5f8c4a69fb42826e1546ad9e19d4e7aac9eff9d27af8d75a1adafe99a5b638b2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.