diff options
| author | Mateusz Kulikowski <mateusz.kulikowski@gmail.com> | 2015-05-31 20:19:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-01 06:33:22 +0900 |
| commit | a94aa9adb6fe79ddb9181bddd34ade3e8718c582 (patch) | |
| tree | 0a939cb53c4aa790caf01c7b02ba2a20d0b86ee5 /drivers/staging/rtl8192e/rtllib_rx.c | |
| parent | 2b2215af34c7bcf737b90d0459560e3716944429 (diff) | |
| download | op-kernel-dev-a94aa9adb6fe79ddb9181bddd34ade3e8718c582.zip op-kernel-dev-a94aa9adb6fe79ddb9181bddd34ade3e8718c582.tar.gz | |
staging: rtl8192e: Replace ?: with max_t
Improve readability and make checkpatch happy.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192e/rtllib_rx.c')
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 588c6d7..2280d18 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1685,7 +1685,7 @@ static int rtllib_qos_convert_ac_to_parameters(struct rtllib_qos_parameter_info qos_param->aifs[aci] = (ac_params->aci_aifsn) & 0x0f; /* WMM spec P.11: The minimum value for AIFSN shall be 2 */ - qos_param->aifs[aci] = (qos_param->aifs[aci] < 2) ? 2 : qos_param->aifs[aci]; + qos_param->aifs[aci] = max_t(u8, qos_param->aifs[aci], 2); qos_param->cw_min[aci] = cpu_to_le16(ac_params->ecw_min_max & 0x0F); |
