mt76: mt76x02u: avoid overwrite max_tx_fragments

Starting from 'commit ee8040139ab1 ("mt76: do not overwrite
max_tx_fragments if it has been set")' we can avoid overwriting
max_tx_fragments for mt76x02u devices

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index abf0a19ee70efb8fa714861d5b3762d36b686b95..68a00795c91ea77eba817ebd0b87ffce4238fb2f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -182,16 +182,12 @@ static int mt76x0u_register_device(struct mt76x02_dev *dev)
        if (err < 0)
                goto out_err;
 
+       /* check hw sg support in order to enable AMSDU */
+       hw->max_tx_fragments = dev->mt76.usb.sg_en ? MT_TX_SG_MAX_SIZE : 1;
        err = mt76x0_register_device(dev);
        if (err < 0)
                goto out_err;
 
-       /* check hw sg support in order to enable AMSDU */
-       if (dev->mt76.usb.sg_en)
-               hw->max_tx_fragments = MT_TX_SG_MAX_SIZE;
-       else
-               hw->max_tx_fragments = 1;
-
        set_bit(MT76_STATE_INITIALIZED, &dev->mphy.state);
 
        return 0;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
index 62e5e89baf2346cf0d9da1ea743f03ad7e410d85..d2ca8fe426553f7eb797194964c272404b4a0229 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
@@ -207,17 +207,13 @@ int mt76x2u_register_device(struct mt76x02_dev *dev)
        if (err < 0)
                goto fail;
 
+       /* check hw sg support in order to enable AMSDU */
+       hw->max_tx_fragments = dev->mt76.usb.sg_en ? MT_TX_SG_MAX_SIZE : 1;
        err = mt76_register_device(&dev->mt76, true, mt76x02_rates,
                                   ARRAY_SIZE(mt76x02_rates));
        if (err)
                goto fail;
 
-       /* check hw sg support in order to enable AMSDU */
-       if (dev->mt76.usb.sg_en)
-               hw->max_tx_fragments = MT_TX_SG_MAX_SIZE;
-       else
-               hw->max_tx_fragments = 1;
-
        set_bit(MT76_STATE_INITIALIZED, &dev->mphy.state);
 
        mt76x02_init_debugfs(dev);