Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / net / bluetooth / l2cap.c

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index efac637..54992f7 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -366,6 +366,16 @@ static inline int l2cap_send_sframe(struct l2cap_pinfo *pi, u16 control)
        return hci_send_acl(pi->conn->hcon, skb, 0);
 }
 
+static inline int l2cap_send_rr_or_rnr(struct l2cap_pinfo *pi, u16 control)
+{
+       if (pi->conn_state & L2CAP_CONN_LOCAL_BUSY)
+               control |= L2CAP_SUPER_RCV_NOT_READY;
+       else
+               control |= L2CAP_SUPER_RCV_READY;
+
+       return l2cap_send_sframe(pi, control);
+}
+
 static void l2cap_do_start(struct sock *sk)
 {
        struct l2cap_conn *conn = l2cap_pi(sk)->conn;
@@ -545,12 +555,12 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status)
 
        conn->feat_mask = 0;
 
-       setup_timer(&conn->info_timer, l2cap_info_timeout,
-                                               (unsigned long) conn);
-
        spin_lock_init(&conn->lock);
        rwlock_init(&conn->chan_list.lock);
 
+       setup_timer(&conn->info_timer, l2cap_info_timeout,
+                                               (unsigned long) conn);
+
        conn->disc_reason = 0x13;
 
        return conn;
@@ -773,6 +783,9 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
        /* Default config options */
        pi->conf_len = 0;
        pi->flush_to = L2CAP_DEFAULT_FLUSH_TO;
+       skb_queue_head_init(TX_QUEUE(sk));
+       skb_queue_head_init(SREJ_QUEUE(sk));
+       INIT_LIST_HEAD(SREJ_LIST(sk));
 }
 
 static struct proto l2cap_proto = {
@@ -806,7 +819,8 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, int p
        return sk;
 }
 
-static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol)
+static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol,
+                            int kern)
 {
        struct sock *sk;
 
@@ -818,7 +832,7 @@ static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol)
                        sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
                return -ESOCKTNOSUPPORT;
 
-       if (sock->type == SOCK_RAW && !capable(CAP_NET_RAW))
+       if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
                return -EPERM;
 
        sock->ops = &l2cap_sock_ops;
@@ -1202,8 +1216,7 @@ static void l2cap_monitor_timeout(unsigned long arg)
        __mod_monitor_timer();
 
        control = L2CAP_CTRL_POLL;
-       control |= L2CAP_SUPER_RCV_READY;
-       l2cap_send_sframe(l2cap_pi(sk), control);
+       l2cap_send_rr_or_rnr(l2cap_pi(sk), control);
        bh_unlock_sock(sk);
 }
 
@@ -1219,8 +1232,7 @@ static void l2cap_retrans_timeout(unsigned long arg)
        l2cap_pi(sk)->conn_state |= L2CAP_CONN_WAIT_F;
 
        control = L2CAP_CTRL_POLL;
-       control |= L2CAP_SUPER_RCV_READY;
-       l2cap_send_sframe(l2cap_pi(sk), control);
+       l2cap_send_rr_or_rnr(l2cap_pi(sk), control);
        bh_unlock_sock(sk);
 }
 
@@ -1350,7 +1362,8 @@ static int l2cap_ertm_send(struct sock *sk)
        if (pi->conn_state & L2CAP_CONN_WAIT_F)
                return 0;
 
-       while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk))) {
+       while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk)) &&
+              !(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)) {
                tx_skb = skb_clone(skb, GFP_ATOMIC);
 
                if (pi->remote_max_tx &&
@@ -1591,8 +1604,8 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
                return -EOPNOTSUPP;
 
        /* Check outgoing MTU */
-       if (sk->sk_type == SOCK_SEQPACKET && pi->mode == L2CAP_MODE_BASIC
-                       && len > pi->omtu)
+       if (sk->sk_type == SOCK_SEQPACKET && pi->mode == L2CAP_MODE_BASIC &&
+           len > pi->omtu)
                return -EINVAL;
 
        lock_sock(sk);
@@ -1689,7 +1702,7 @@ static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct ms
        return bt_sock_recvmsg(iocb, sock, msg, len, flags);
 }
 
-static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __user *optval, int optlen)
+static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __user *optval, unsigned int optlen)
 {
        struct sock *sk = sock->sk;
        struct l2cap_options opts;
@@ -1746,7 +1759,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
        return err;
 }
 
-static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)
+static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen)
 {
        struct sock *sk = sock->sk;
        struct bt_security sec;
@@ -2193,7 +2206,7 @@ static int l2cap_build_conf_req(struct sock *sk, void *data)
 {
        struct l2cap_pinfo *pi = l2cap_pi(sk);
        struct l2cap_conf_req *req = data;
-       struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_ERTM };
+       struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };
        void *ptr = req->data;
 
        BT_DBG("sk %p", sk);
@@ -2382,6 +2395,10 @@ done:
                        rfc.monitor_timeout = L2CAP_DEFAULT_MONITOR_TO;
 
                        pi->conf_state |= L2CAP_CONF_MODE_DONE;
+
+                       l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
+                                       sizeof(rfc), (unsigned long) &rfc);
+
                        break;
 
                case L2CAP_MODE_STREAMING:
@@ -2389,6 +2406,10 @@ done:
                        pi->max_pdu_size = rfc.max_pdu_size;
 
                        pi->conf_state |= L2CAP_CONF_MODE_DONE;
+
+                       l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
+                                       sizeof(rfc), (unsigned long) &rfc);
+
                        break;
 
                default:
@@ -2398,9 +2419,6 @@ done:
                        rfc.mode = pi->mode;
                }
 
-               l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
-                                       sizeof(rfc), (unsigned long) &rfc);
-
                if (result == L2CAP_CONF_SUCCESS)
                        pi->conf_state |= L2CAP_CONF_OUTPUT_DONE;
        }
@@ -2738,8 +2756,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
                goto unlock;
 
        if (l2cap_pi(sk)->conf_state & L2CAP_CONF_INPUT_DONE) {
-               if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_NO_FCS_RECV)
-                               || l2cap_pi(sk)->fcs != L2CAP_FCS_NONE)
+               if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_NO_FCS_RECV) ||
+                   l2cap_pi(sk)->fcs != L2CAP_FCS_NONE)
                        l2cap_pi(sk)->fcs = L2CAP_FCS_CRC16;
 
                sk->sk_state = BT_CONNECTED;
@@ -2827,8 +2845,8 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
        l2cap_pi(sk)->conf_state |= L2CAP_CONF_INPUT_DONE;
 
        if (l2cap_pi(sk)->conf_state & L2CAP_CONF_OUTPUT_DONE) {
-               if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_NO_FCS_RECV)
-                               || l2cap_pi(sk)->fcs != L2CAP_FCS_NONE)
+               if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_NO_FCS_RECV) ||
+                   l2cap_pi(sk)->fcs != L2CAP_FCS_NONE)
                        l2cap_pi(sk)->fcs = L2CAP_FCS_CRC16;
 
                sk->sk_state = BT_CONNECTED;
@@ -2924,7 +2942,7 @@ static inline int l2cap_information_req(struct l2cap_conn *conn, struct l2cap_cm
                if (enable_ertm)
                        feat_mask |= L2CAP_FEAT_ERTM | L2CAP_FEAT_STREAMING
                                                         | L2CAP_FEAT_FCS;
-               put_unaligned(cpu_to_le32(feat_mask), (__le32 *) rsp->data);
+               put_unaligned_le32(feat_mask, rsp->data);
                l2cap_send_cmd(conn, cmd->ident,
                                        L2CAP_INFO_RSP, sizeof(buf), buf);
        } else if (type == L2CAP_IT_FIXED_CHAN) {
@@ -3348,9 +3366,16 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
        case L2CAP_SUPER_RCV_READY:
                if (rx_control & L2CAP_CTRL_POLL) {
                        u16 control = L2CAP_CTRL_FINAL;
-                       control |= L2CAP_SUPER_RCV_READY;
+                       control |= L2CAP_SUPER_RCV_READY |
+                               (pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT);
                        l2cap_send_sframe(l2cap_pi(sk), control);
+                       pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
+
                } else if (rx_control & L2CAP_CTRL_FINAL) {
+                       pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
+                       pi->expected_ack_seq = tx_seq;
+                       l2cap_drop_acked_frames(sk);
+
                        if (!(pi->conn_state & L2CAP_CONN_WAIT_F))
                                break;
 
@@ -3362,13 +3387,19 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
                } else {
                        pi->expected_ack_seq = tx_seq;
                        l2cap_drop_acked_frames(sk);
-                       if (pi->unacked_frames > 0)
+
+                       if ((pi->conn_state & L2CAP_CONN_REMOTE_BUSY) &&
+                           (pi->unacked_frames > 0))
                                __mod_retrans_timer();
+
                        l2cap_ertm_send(sk);
+                       pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
                }
                break;
 
        case L2CAP_SUPER_REJECT:
+               pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
+
                pi->expected_ack_seq = __get_reqseq(rx_control);
                l2cap_drop_acked_frames(sk);
 
@@ -3380,6 +3411,8 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
                break;
 
        case L2CAP_SUPER_SELECT_REJECT:
+               pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
+
                if (rx_control & L2CAP_CTRL_POLL) {
                        l2cap_retransmit_frame(sk, tx_seq);
                        pi->expected_ack_seq = tx_seq;
@@ -3406,6 +3439,15 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
                break;
 
        case L2CAP_SUPER_RCV_NOT_READY:
+               pi->conn_state |= L2CAP_CONN_REMOTE_BUSY;
+               pi->expected_ack_seq = tx_seq;
+               l2cap_drop_acked_frames(sk);
+
+               del_timer(&l2cap_pi(sk)->retrans_timer);
+               if (rx_control & L2CAP_CTRL_POLL) {
+                       u16 control = L2CAP_CTRL_FINAL;
+                       l2cap_send_rr_or_rnr(l2cap_pi(sk), control);
+               }
                break;
        }
 
@@ -3572,7 +3614,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
                break;
 
        case L2CAP_CID_CONN_LESS:
-               psm = get_unaligned((__le16 *) skb->data);
+               psm = get_unaligned_le16(skb->data);
                skb_pull(skb, 2);
                l2cap_conless_channel(conn, psm, skb);
                break;
@@ -3883,7 +3925,7 @@ static const struct proto_ops l2cap_sock_ops = {
        .getsockopt     = l2cap_sock_getsockopt
 };
 
-static struct net_proto_family l2cap_sock_family_ops = {
+static const struct net_proto_family l2cap_sock_family_ops = {
        .family = PF_BLUETOOTH,
        .owner  = THIS_MODULE,
        .create = l2cap_sock_create,