Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dabc5c67 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Move TSO_CAPABLE assignment 



This patch moves the code that asserts the TSO_CAPABLE flag closer to
where the TSO capabilities flags are set.  There isn't a good enough
reason for the code to be separated.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4452d099

drivers/net/tg3.c

+16 −15
Original line number Original line Diff line number Diff line
@@ -13639,6 +13639,21 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
			tp->fw_needed = FIRMWARE_TG3TSO;

			tp->fw_needed = FIRMWARE_TG3TSO;

	}

	}





	/* Selectively allow TSO based on operating conditions */

	if ((tg3_flag(tp, HW_TSO_1) ||

	     tg3_flag(tp, HW_TSO_2) ||

	     tg3_flag(tp, HW_TSO_3)) ||

	    (tp->fw_needed && !tg3_flag(tp, ENABLE_ASF)))

		tg3_flag_set(tp, TSO_CAPABLE);

	else {

		tg3_flag_clear(tp, TSO_CAPABLE);

		tg3_flag_clear(tp, TSO_BUG);

		tp->fw_needed = NULL;

	}



	if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0)

		tp->fw_needed = FIRMWARE_TG3;



	tp->irq_max = 1;

	tp->irq_max = 1;





	if (tg3_flag(tp, 5750_PLUS)) {

	if (tg3_flag(tp, 5750_PLUS)) {
@@ -13705,6 +13720,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
		if (lnkctl & PCI_EXP_LNKCTL_CLKREQ_EN) {

		if (lnkctl & PCI_EXP_LNKCTL_CLKREQ_EN) {

			if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)

			if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)

				tg3_flag_clear(tp, HW_TSO_2);

				tg3_flag_clear(tp, HW_TSO_2);

				tg3_flag_clear(tp, TSO_CAPABLE);

			if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||

			if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||

			    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 ||

			    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 ||

			    tp->pci_chip_rev_id == CHIPREV_ID_57780_A0 ||

			    tp->pci_chip_rev_id == CHIPREV_ID_57780_A0 ||
@@ -15044,21 +15060,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 




	tg3_init_bufmgr_config(tp);

	tg3_init_bufmgr_config(tp);





	/* Selectively allow TSO based on operating conditions */

	if ((tg3_flag(tp, HW_TSO_1) ||

	     tg3_flag(tp, HW_TSO_2) ||

	     tg3_flag(tp, HW_TSO_3)) ||

	    (tp->fw_needed && !tg3_flag(tp, ENABLE_ASF)))

		tg3_flag_set(tp, TSO_CAPABLE);

	else {

		tg3_flag_clear(tp, TSO_CAPABLE);

		tg3_flag_clear(tp, TSO_BUG);

		tp->fw_needed = NULL;

	}



	if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0)

		tp->fw_needed = FIRMWARE_TG3;



	/* TSO is on by default on chips that support hardware TSO.

	/* TSO is on by default on chips that support hardware TSO.

	 * Firmware TSO on older chips gives lower performance, so it

	 * Firmware TSO on older chips gives lower performance, so it

	 * is off by default, but can be enabled using ethtool.

	 * is off by default, but can be enabled using ethtool.