|
@@ -3895,8 +3895,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
entry = tp->tx_prod;
|
|
|
base_flags = 0;
|
|
|
mss = 0;
|
|
|
- if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
|
|
|
- (mss = skb_shinfo(skb)->gso_size) != 0) {
|
|
|
+ if ((mss = skb_shinfo(skb)->gso_size) != 0) {
|
|
|
int tcp_opt_len, ip_tcp_len;
|
|
|
|
|
|
if (skb_header_cloned(skb) &&
|
|
@@ -4053,8 +4052,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)
|
|
|
if (skb->ip_summed == CHECKSUM_PARTIAL)
|
|
|
base_flags |= TXD_FLAG_TCPUDP_CSUM;
|
|
|
mss = 0;
|
|
|
- if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
|
|
|
- (mss = skb_shinfo(skb)->gso_size) != 0) {
|
|
|
+ if ((mss = skb_shinfo(skb)->gso_size) != 0) {
|
|
|
struct iphdr *iph;
|
|
|
int tcp_opt_len, ip_tcp_len, hdr_len;
|
|
|
|
|
@@ -6346,8 +6344,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
|
|
|
tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
|
|
|
(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)) {
|
|
|
if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE &&
|
|
|
- (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
|
|
|
- tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
|
|
|
+ GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
|
|
|
rdmac_mode |= RDMAC_MODE_FIFO_SIZE_128;
|
|
|
} else if (!(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) &&
|
|
|
!(tp->tg3_flags2 & TG3_FLG2_IS_5788)) {
|