Bluetooth: Move recently-added ERTM header packing functions

Moving these functions simplifies future patches by eliminating
forward declarations, makes future patches easier to review, and
better preserves 'git blame' information.

Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 5199e5cbedaac3dadc1176cb19d37b3ff8875260..bdb20c07bb080539067e0ebdabf262b4fe7637d2 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -724,6 +724,57 @@ static void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb)
        hci_send_acl(chan->conn->hchan, skb, flags);
 }
 
+static u32 __pack_extended_control(struct l2cap_ctrl *control)
+{
+       u32 packed;
+
+       packed = control->reqseq << L2CAP_EXT_CTRL_REQSEQ_SHIFT;
+       packed |= control->final << L2CAP_EXT_CTRL_FINAL_SHIFT;
+
+       if (control->sframe) {
+               packed |= control->poll << L2CAP_EXT_CTRL_POLL_SHIFT;
+               packed |= control->super << L2CAP_EXT_CTRL_SUPER_SHIFT;
+               packed |= L2CAP_EXT_CTRL_FRAME_TYPE;
+       } else {
+               packed |= control->sar << L2CAP_EXT_CTRL_SAR_SHIFT;
+               packed |= control->txseq << L2CAP_EXT_CTRL_TXSEQ_SHIFT;
+       }
+
+       return packed;
+}
+
+static u16 __pack_enhanced_control(struct l2cap_ctrl *control)
+{
+       u16 packed;
+
+       packed = control->reqseq << L2CAP_CTRL_REQSEQ_SHIFT;
+       packed |= control->final << L2CAP_CTRL_FINAL_SHIFT;
+
+       if (control->sframe) {
+               packed |= control->poll << L2CAP_CTRL_POLL_SHIFT;
+               packed |= control->super << L2CAP_CTRL_SUPER_SHIFT;
+               packed |= L2CAP_CTRL_FRAME_TYPE;
+       } else {
+               packed |= control->sar << L2CAP_CTRL_SAR_SHIFT;
+               packed |= control->txseq << L2CAP_CTRL_TXSEQ_SHIFT;
+       }
+
+       return packed;
+}
+
+static inline void __pack_control(struct l2cap_chan *chan,
+                                 struct l2cap_ctrl *control,
+                                 struct sk_buff *skb)
+{
+       if (test_bit(FLAG_EXT_CTRL, &chan->flags)) {
+               put_unaligned_le32(__pack_extended_control(control),
+                                  skb->data + L2CAP_HDR_SIZE);
+       } else {
+               put_unaligned_le16(__pack_enhanced_control(control),
+                                  skb->data + L2CAP_HDR_SIZE);
+       }
+}
+
 static inline void l2cap_send_sframe(struct l2cap_chan *chan, u32 control)
 {
        struct sk_buff *skb;
@@ -786,25 +837,6 @@ static inline void l2cap_send_rr_or_rnr(struct l2cap_chan *chan, u32 control)
        l2cap_send_sframe(chan, control);
 }
 
-static u16 __pack_enhanced_control(struct l2cap_ctrl *control)
-{
-       u16 packed;
-
-       packed = control->reqseq << L2CAP_CTRL_REQSEQ_SHIFT;
-       packed |= control->final << L2CAP_CTRL_FINAL_SHIFT;
-
-       if (control->sframe) {
-               packed |= control->poll << L2CAP_CTRL_POLL_SHIFT;
-               packed |= control->super << L2CAP_CTRL_SUPER_SHIFT;
-               packed |= L2CAP_CTRL_FRAME_TYPE;
-       } else {
-               packed |= control->sar << L2CAP_CTRL_SAR_SHIFT;
-               packed |= control->txseq << L2CAP_CTRL_TXSEQ_SHIFT;
-       }
-
-       return packed;
-}
-
 static void __unpack_enhanced_control(u16 enh, struct l2cap_ctrl *control)
 {
        control->reqseq = (enh & L2CAP_CTRL_REQSEQ) >> L2CAP_CTRL_REQSEQ_SHIFT;
@@ -829,25 +861,6 @@ static void __unpack_enhanced_control(u16 enh, struct l2cap_ctrl *control)
        }
 }
 
-static u32 __pack_extended_control(struct l2cap_ctrl *control)
-{
-       u32 packed;
-
-       packed = control->reqseq << L2CAP_EXT_CTRL_REQSEQ_SHIFT;
-       packed |= control->final << L2CAP_EXT_CTRL_FINAL_SHIFT;
-
-       if (control->sframe) {
-               packed |= control->poll << L2CAP_EXT_CTRL_POLL_SHIFT;
-               packed |= control->super << L2CAP_EXT_CTRL_SUPER_SHIFT;
-               packed |= L2CAP_EXT_CTRL_FRAME_TYPE;
-       } else {
-               packed |= control->sar << L2CAP_EXT_CTRL_SAR_SHIFT;
-               packed |= control->txseq << L2CAP_EXT_CTRL_TXSEQ_SHIFT;
-       }
-
-       return packed;
-}
-
 static void __unpack_extended_control(u32 ext, struct l2cap_ctrl *control)
 {
        control->reqseq = (ext & L2CAP_EXT_CTRL_REQSEQ) >> L2CAP_EXT_CTRL_REQSEQ_SHIFT;
@@ -884,19 +897,6 @@ static inline void __unpack_control(struct l2cap_chan *chan,
        }
 }
 
-static inline void __pack_control(struct l2cap_chan *chan,
-                                 struct l2cap_ctrl *control,
-                                 struct sk_buff *skb)
-{
-       if (test_bit(FLAG_EXT_CTRL, &chan->flags)) {
-               put_unaligned_le32(__pack_extended_control(control),
-                                  skb->data + L2CAP_HDR_SIZE);
-       } else {
-               put_unaligned_le16(__pack_enhanced_control(control),
-                                  skb->data + L2CAP_HDR_SIZE);
-       }
-}
-
 static inline int __l2cap_no_conn_pending(struct l2cap_chan *chan)
 {
        return !test_bit(CONF_CONNECT_PEND, &chan->conf_state);