staging: rtl8712: rtl871x_ioctl_linux.c: Cleaning up useless if statement
authorRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Sun, 15 Jun 2014 17:20:58 +0000 (19:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jun 2014 23:44:06 +0000 (16:44 -0700)
The same code regardless of the outcome of the if statement.
And clean up another duplicate line of code.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/rtl871x_ioctl_linux.c

index e147c4bfe124fbb337bc41799b0f097e12b03d1f..6d6f15d1cc75bef7be8734723bc4501ac0038d9e 100644 (file)
@@ -1459,17 +1459,12 @@ static int r8711_wx_get_rate(struct net_device *dev,
                                RTL8712_RF_2T2R == rf_type)
                                max_rate = (bw_40MHz) ? ((short_GI) ? 300 :
                                            270) : ((short_GI) ? 144 : 130);
-                       else if (mcs_rate & 0x0080) /* MCS7 */
-                               max_rate = (bw_40MHz) ? ((short_GI) ? 150 :
-                                           135) : ((short_GI) ? 72 : 65);
                        else /* default MCS7 */
                                max_rate = (bw_40MHz) ? ((short_GI) ? 150 :
                                            135) : ((short_GI) ? 72 : 65);
                        max_rate *= 2; /* Mbps/2 */
-                       wrqu->bitrate.value = max_rate * 500000;
-               } else {
-                       wrqu->bitrate.value = max_rate * 500000;
                }
+               wrqu->bitrate.value = max_rate * 500000;
        } else
                return -ENOLINK;
        return 0;