From: Malcolm Priestley Date: Thu, 10 Jul 2014 18:56:08 +0000 (+0100) Subject: staging: vt6656: s_vGenerateTxParameter rxtx.c s_vGenerateTxParameter pBuf->rrv_time... X-Git-Tag: firefly_0821_release~176^2~3491^2~958 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f1be5759bc8998ac9b4b694d318d0f3a74e7e531;p=firefly-linux-kernel-4.4.55.git staging: vt6656: s_vGenerateTxParameter rxtx.c s_vGenerateTxParameter pBuf->rrv_time always the calling pkt_type 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 49bda3c0ab37..bad2fe45b925 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -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,