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

Commit d2d746f8 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[TG3]: Kill some less useful flags 



Kill the TG3_FLAG_NO_{TX|RX}_PSEUDO_CSUM flags because they are not
very useful. This will free up some bits for new flags.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7a43c995

drivers/net/tg3.c

+8 −13
Original line number Diff line number Diff line
@@ -5828,10 +5828,14 @@ static int tg3_reset_hw(struct tg3 *tp) 
			  GRC_MODE_NO_TX_PHDR_CSUM |

			  GRC_MODE_NO_RX_PHDR_CSUM);

	tp->grc_mode |= GRC_MODE_HOST_SENDBDS;

	if (tp->tg3_flags & TG3_FLAG_NO_TX_PSEUDO_CSUM)



	/* Pseudo-header checksum is done by hardware logic and not

	 * the offload processers, so make the chip do the pseudo-

	 * header checksums on receive.  For transmit it is more

	 * convenient to do the pseudo-header checksum in software

	 * as Linux does that on transmit for us in all cases.

	 */

	tp->grc_mode |= GRC_MODE_NO_TX_PHDR_CSUM;

	if (tp->tg3_flags & TG3_FLAG_NO_RX_PSEUDO_CSUM)

		tp->grc_mode |= GRC_MODE_NO_RX_PHDR_CSUM;



	tw32(GRC_MODE,

	     tp->grc_mode |
@@ -10303,15 +10307,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	if (tp->pci_chip_rev_id == CHIPREV_ID_5700_B0)

		tp->tg3_flags |= TG3_FLAG_BROKEN_CHECKSUMS;



	/* Pseudo-header checksum is done by hardware logic and not

	 * the offload processers, so make the chip do the pseudo-

	 * header checksums on receive.  For transmit it is more

	 * convenient to do the pseudo-header checksum in software

	 * as Linux does that on transmit for us in all cases.

	 */

	tp->tg3_flags |= TG3_FLAG_NO_TX_PSEUDO_CSUM;

	tp->tg3_flags &= ~TG3_FLAG_NO_RX_PSEUDO_CSUM;



	/* Derive initial jumbo mode from MTU assigned in

	 * ether_setup() via the alloc_etherdev() call

	 */

drivers/net/tg3.h

+0 −2
Original line number Diff line number Diff line
@@ -2171,8 +2171,6 @@ struct tg3 { 
#define TG3_FLAG_PCIX_MODE		0x00020000

#define TG3_FLAG_PCI_HIGH_SPEED		0x00040000

#define TG3_FLAG_PCI_32BIT		0x00080000

#define TG3_FLAG_NO_TX_PSEUDO_CSUM	0x00100000

#define TG3_FLAG_NO_RX_PSEUDO_CSUM	0x00200000

#define TG3_FLAG_SERDES_WOL_CAP		0x00400000

#define TG3_FLAG_JUMBO_RING_ENABLE	0x00800000

#define TG3_FLAG_10_100_ONLY		0x01000000