Bluetooth: Don't set control bits to zero first

We can set the SAR bits in the control field directly.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 31514d8faa66..cfb18cd97564 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1636,16 +1636,15 @@ static inline int l2cap_sar_segment_sdu(struct sock *sk, struct msghdr *msg, siz
         __skb_queue_tail(&sar_queue, skb);
         len -= pi->remote_mps;
         size += pi->remote_mps;
-        control = 0;
 
         while (len > 0) {
                 size_t buflen;
 
                 if (len > pi->remote_mps) {
-                        control |= L2CAP_SDU_CONTINUE;
+                        control = L2CAP_SDU_CONTINUE;
                         buflen = pi->remote_mps;
                 } else {
-                        control |= L2CAP_SDU_END;
+                        control = L2CAP_SDU_END;
                         buflen = len;
                 }
 
@@ -1658,7 +1657,6 @@ static inline int l2cap_sar_segment_sdu(struct sock *sk, struct msghdr *msg, siz
                 __skb_queue_tail(&sar_queue, skb);
                 len -= buflen;
                 size += buflen;
-                control = 0;
         }
         skb_queue_splice_tail(&sar_queue, TX_QUEUE(sk));
         if (sk->sk_send_head == NULL)