aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2012-03-07 23:25:00 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2012-03-08 00:02:26 -0500
commit04124681f104c1980024ff249a34a77a249fd2bc (patch)
tree5caad821f1cdd55930b054cbdeab1c45421559b4 /net/bluetooth/l2cap_core.c
parentf64b993f44c3a5fe709b276ac5652d006afe9d33 (diff)
Bluetooth: fix conding style issues all over the tree
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
-rw-r--r--net/bluetooth/l2cap_core.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 0b1aabff864..3e450f4a312 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1546,7 +1546,9 @@ static void l2cap_send_srejtail(struct l2cap_chan *chan)
1546 l2cap_send_sframe(chan, control); 1546 l2cap_send_sframe(chan, control);
1547} 1547}
1548 1548
1549static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan, struct msghdr *msg, int len, int count, struct sk_buff *skb) 1549static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan,
1550 struct msghdr *msg, int len,
1551 int count, struct sk_buff *skb)
1550{ 1552{
1551 struct l2cap_conn *conn = chan->conn; 1553 struct l2cap_conn *conn = chan->conn;
1552 struct sk_buff **frag; 1554 struct sk_buff **frag;
@@ -1564,7 +1566,8 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan, struct msghdr
1564 count = min_t(unsigned int, conn->mtu, len); 1566 count = min_t(unsigned int, conn->mtu, len);
1565 1567
1566 *frag = chan->ops->alloc_skb(chan, count, 1568 *frag = chan->ops->alloc_skb(chan, count,
1567 msg->msg_flags & MSG_DONTWAIT, &err); 1569 msg->msg_flags & MSG_DONTWAIT,
1570 &err);
1568 1571
1569 if (!*frag) 1572 if (!*frag)
1570 return err; 1573 return err;
@@ -1596,7 +1599,7 @@ static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan,
1596 count = min_t(unsigned int, (conn->mtu - hlen), len); 1599 count = min_t(unsigned int, (conn->mtu - hlen), len);
1597 1600
1598 skb = chan->ops->alloc_skb(chan, count + hlen, 1601 skb = chan->ops->alloc_skb(chan, count + hlen,
1599 msg->msg_flags & MSG_DONTWAIT, &err); 1602 msg->msg_flags & MSG_DONTWAIT, &err);
1600 1603
1601 if (!skb) 1604 if (!skb)
1602 return ERR_PTR(err); 1605 return ERR_PTR(err);
@@ -1631,7 +1634,7 @@ static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan,
1631 count = min_t(unsigned int, (conn->mtu - hlen), len); 1634 count = min_t(unsigned int, (conn->mtu - hlen), len);
1632 1635
1633 skb = chan->ops->alloc_skb(chan, count + hlen, 1636 skb = chan->ops->alloc_skb(chan, count + hlen,
1634 msg->msg_flags & MSG_DONTWAIT, &err); 1637 msg->msg_flags & MSG_DONTWAIT, &err);
1635 1638
1636 if (!skb) 1639 if (!skb)
1637 return ERR_PTR(err); 1640 return ERR_PTR(err);