Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8712 / rtl8712_xmit.c

diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl8712/rtl8712_xmit.c
index 7e0b94503dfc4f2d9ee791238e1f2d535f3b506b..4bbf76f27ad0b3ed280ee5e252db107f7ec40034 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_xmit.c
+++ b/drivers/staging/rtl8712/rtl8712_xmit.c
@@ -535,7 +535,8 @@ static void update_txdesc(struct xmit_frame *pxmitframe, uint *pmem, int sz)
                 * seqnum per tid. about usb using 4-endpoint, qsel points out
                 * the correct mapping between AC&Endpoint,
                 * the purpose is that correct mapping lets the MAC release
-                * the AC Queue list correctly. */
+                * the AC Queue list correctly.
+                */
                ptxdesc->txdw3 = cpu_to_le32((pattrib->priority << SEQ_SHT) &
                                 0x0fff0000);
                if ((pattrib->ether_type != 0x888e) &&
@@ -586,7 +587,8 @@ static void update_txdesc(struct xmit_frame *pxmitframe, uint *pmem, int sz)
                 * per tid. about usb using 4-endpoint, qsel points out the
                 * correct mapping between AC&Endpoint,
                 * the purpose is that correct mapping let the MAC releases
-                * the AC Queue list correctly. */
+                * the AC Queue list correctly.
+                */
                ptxdesc->txdw3 = cpu_to_le32((pattrib->priority << SEQ_SHT) &
                                              0x0fff0000);
                /* offset 16 */
@@ -686,7 +688,8 @@ int r8712_xmitframe_complete(struct _adapter *padapter,
                                res = r8712_xmitframe_coalesce(padapter,
                                        pxmitframe->pkt, pxmitframe);
                        /* always return ndis_packet after
-                        * r8712_xmitframe_coalesce */
+                        * r8712_xmitframe_coalesce
+                        */
                        r8712_xmit_complete(padapter, pxmitframe);
                }
                if (res == _SUCCESS)