staging: vt6656: s_vGenerateTxParameter rxtx.c s_vGenerateTxParameter pBuf->rrv_time...
authorMalcolm Priestley <tvboxspy@gmail.com>
Thu, 10 Jul 2014 18:56:08 +0000 (19:56 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Jul 2014 22:17:14 +0000 (15:17 -0700)
Use byPktType instead of macro.

The pkt_type has already been filtered in this function so its always set
to the correct one.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/rxtx.c

index 49bda3c0ab37a163e21dea595c386c0290d365fd..bad2fe45b92523d2191248bfe7361e00b9c86f6d 100644 (file)
@@ -760,7 +760,7 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
                                                        tx_head.tx_ab.ab;
 
                        pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,
-                               PK_TYPE_11A, cbFrameSize,
+                               byPktType, cbFrameSize,
                                        wCurrentRate, bNeedACK);
 
                        return vnt_rxtx_datahead_a_fb(tx_context, byPktType,
@@ -783,7 +783,7 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
                                byPktType, cbFrameSize, wCurrentRate);
 
                        pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,
-                               PK_TYPE_11B, cbFrameSize, wCurrentRate,
+                               byPktType, cbFrameSize, wCurrentRate,
                                                                bNeedACK);
 
                        /* Fill RTS */
@@ -795,7 +795,7 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
                                                        tx_head.tx_ab.ab;
 
                        pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,
-                               PK_TYPE_11B, cbFrameSize,
+                               byPktType, cbFrameSize,
                                        wCurrentRate, bNeedACK);
 
                        return vnt_rxtx_datahead_ab(tx_context, byPktType,