[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: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
7a43c99551
commit
d2d746f83b
|
@ -5828,10 +5828,14 @@ static int tg3_reset_hw(struct tg3 *tp)
|
||||||
GRC_MODE_NO_TX_PHDR_CSUM |
|
GRC_MODE_NO_TX_PHDR_CSUM |
|
||||||
GRC_MODE_NO_RX_PHDR_CSUM);
|
GRC_MODE_NO_RX_PHDR_CSUM);
|
||||||
tp->grc_mode |= GRC_MODE_HOST_SENDBDS;
|
tp->grc_mode |= GRC_MODE_HOST_SENDBDS;
|
||||||
if (tp->tg3_flags & TG3_FLAG_NO_TX_PSEUDO_CSUM)
|
|
||||||
tp->grc_mode |= GRC_MODE_NO_TX_PHDR_CSUM;
|
/* Pseudo-header checksum is done by hardware logic and not
|
||||||
if (tp->tg3_flags & TG3_FLAG_NO_RX_PSEUDO_CSUM)
|
* the offload processers, so make the chip do the pseudo-
|
||||||
tp->grc_mode |= GRC_MODE_NO_RX_PHDR_CSUM;
|
* 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;
|
||||||
|
|
||||||
tw32(GRC_MODE,
|
tw32(GRC_MODE,
|
||||||
tp->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)
|
if (tp->pci_chip_rev_id == CHIPREV_ID_5700_B0)
|
||||||
tp->tg3_flags |= TG3_FLAG_BROKEN_CHECKSUMS;
|
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
|
/* Derive initial jumbo mode from MTU assigned in
|
||||||
* ether_setup() via the alloc_etherdev() call
|
* ether_setup() via the alloc_etherdev() call
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -2171,8 +2171,6 @@ struct tg3 {
|
||||||
#define TG3_FLAG_PCIX_MODE 0x00020000
|
#define TG3_FLAG_PCIX_MODE 0x00020000
|
||||||
#define TG3_FLAG_PCI_HIGH_SPEED 0x00040000
|
#define TG3_FLAG_PCI_HIGH_SPEED 0x00040000
|
||||||
#define TG3_FLAG_PCI_32BIT 0x00080000
|
#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_SERDES_WOL_CAP 0x00400000
|
||||||
#define TG3_FLAG_JUMBO_RING_ENABLE 0x00800000
|
#define TG3_FLAG_JUMBO_RING_ENABLE 0x00800000
|
||||||
#define TG3_FLAG_10_100_ONLY 0x01000000
|
#define TG3_FLAG_10_100_ONLY 0x01000000
|
||||||
|
|
Loading…
Reference in a new issue