tcp: call sk_wmem_schedule before sk_mem_charge in zerocopy path

[linux-2.6-microblaze.git] / net / bluetooth / l2cap_core.c

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index b6a88b8..77ba682 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1691,7 +1691,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
        if (hcon->out)
                smp_conn_security(hcon, hcon->pending_sec_level);
 
-       /* For LE slave connections, make sure the connection interval
+       /* For LE peripheral connections, make sure the connection interval
         * is in the range of the minimum and maximum interval that has
         * been configured for this connection. If not, then trigger
         * the connection update procedure.
@@ -4237,7 +4237,7 @@ static int l2cap_connect_req(struct l2cap_conn *conn,
        hci_dev_lock(hdev);
        if (hci_dev_test_flag(hdev, HCI_MGMT) &&
            !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &hcon->flags))
-               mgmt_device_connected(hdev, hcon, 0, NULL, 0);
+               mgmt_device_connected(hdev, hcon, NULL, 0);
        hci_dev_unlock(hdev);
 
        l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP, 0);
@@ -6066,7 +6066,7 @@ static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn,
        struct l2cap_ecred_conn_rsp *rsp = (void *) data;
        struct hci_conn *hcon = conn->hcon;
        u16 mtu, mps, credits, result;
-       struct l2cap_chan *chan;
+       struct l2cap_chan *chan, *tmp;
        int err = 0, sec_level;
        int i = 0;
 
@@ -6085,7 +6085,7 @@ static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn,
 
        cmd_len -= sizeof(*rsp);
 
-       list_for_each_entry(chan, &conn->chan_l, list) {
+       list_for_each_entry_safe(chan, tmp, &conn->chan_l, list) {
                u16 dcid;
 
                if (chan->ident != cmd->ident ||
@@ -6248,7 +6248,7 @@ static inline int l2cap_ecred_reconf_rsp(struct l2cap_conn *conn,
                                         struct l2cap_cmd_hdr *cmd, u16 cmd_len,
                                         u8 *data)
 {
-       struct l2cap_chan *chan;
+       struct l2cap_chan *chan, *tmp;
        struct l2cap_ecred_conn_rsp *rsp = (void *) data;
        u16 result;
 
@@ -6262,7 +6262,7 @@ static inline int l2cap_ecred_reconf_rsp(struct l2cap_conn *conn,
        if (!result)
                return 0;
 
-       list_for_each_entry(chan, &conn->chan_l, list) {
+       list_for_each_entry_safe(chan, tmp, &conn->chan_l, list) {
                if (chan->ident != cmd->ident)
                        continue;
 
@@ -7662,7 +7662,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
         * at least ensure that we ignore incoming data from them.
         */
        if (hcon->type == LE_LINK &&
-           hci_bdaddr_list_lookup(&hcon->hdev->blacklist, &hcon->dst,
+           hci_bdaddr_list_lookup(&hcon->hdev->reject_list, &hcon->dst,
                                   bdaddr_dst_type(hcon))) {
                kfree_skb(skb);
                return;
@@ -8119,7 +8119,7 @@ static void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
        dst_type = bdaddr_dst_type(hcon);
 
        /* If device is blocked, do not create channels for it */
-       if (hci_bdaddr_list_lookup(&hdev->blacklist, &hcon->dst, dst_type))
+       if (hci_bdaddr_list_lookup(&hdev->reject_list, &hcon->dst, dst_type))
                return;
 
        /* Find fixed channels and notify them of the new connection. We