staging: vt6656: Remove duplicate code for the phy->service assignment
authorOscar Carter <oscar.carter@gmx.com>
Tue, 14 Apr 2020 15:38:49 +0000 (17:38 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 Apr 2020 11:40:22 +0000 (13:40 +0200)
Take out the "phy->service" assignment from the if-else statement due to
it's the same for the two branches.

Signed-off-by: Oscar Carter <oscar.carter@gmx.com>
Link: https://lore.kernel.org/r/20200414153849.5785-6-oscar.carter@gmx.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/baseband.c

index 3b6f2bcf91a7dfd222be08c39aeb6b56b059847a..13b91d7fc6db510798e4e221140702a98065ea19 100644 (file)
@@ -320,14 +320,13 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
 
        i = tx_rate > RATE_54M ? RATE_54M : tx_rate;
        phy->signal = vnt_phy_signal[i] | mask;
+       phy->service = 0x00;
 
        if (pkt_type == PK_TYPE_11B) {
-               phy->service = 0x00;
                if (ext_bit)
                        phy->service |= 0x80;
                phy->len = cpu_to_le16((u16)count);
        } else {
-               phy->service = 0x00;
                phy->len = cpu_to_le16((u16)frame_length);
        }
 }