tg3: Code movement
This patch just moves some code around for better organization. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
997b4f135b
commit
93a700a9d2
|
@ -3819,6 +3819,7 @@ static int tg3_copper_is_advertising_all(struct tg3 *tp, u32 mask)
|
||||||
if (tg3_ctrl != all_mask)
|
if (tg3_ctrl != all_mask)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4119,8 +4120,8 @@ relink:
|
||||||
newlnkctl = oldlnkctl | PCI_EXP_LNKCTL_CLKREQ_EN;
|
newlnkctl = oldlnkctl | PCI_EXP_LNKCTL_CLKREQ_EN;
|
||||||
if (newlnkctl != oldlnkctl)
|
if (newlnkctl != oldlnkctl)
|
||||||
pci_write_config_word(tp->pdev,
|
pci_write_config_word(tp->pdev,
|
||||||
pci_pcie_cap(tp->pdev) + PCI_EXP_LNKCTL,
|
pci_pcie_cap(tp->pdev) +
|
||||||
newlnkctl);
|
PCI_EXP_LNKCTL, newlnkctl);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (current_link_up != netif_carrier_ok(tp->dev)) {
|
if (current_link_up != netif_carrier_ok(tp->dev)) {
|
||||||
|
@ -6733,6 +6734,10 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
|
||||||
|
!mss && skb->len > VLAN_ETH_FRAME_LEN)
|
||||||
|
base_flags |= TXD_FLAG_JMB_PKT;
|
||||||
|
|
||||||
#ifdef BCM_KERNEL_SUPPORTS_8021Q
|
#ifdef BCM_KERNEL_SUPPORTS_8021Q
|
||||||
if (vlan_tx_tag_present(skb)) {
|
if (vlan_tx_tag_present(skb)) {
|
||||||
base_flags |= TXD_FLAG_VLAN;
|
base_flags |= TXD_FLAG_VLAN;
|
||||||
|
@ -6740,10 +6745,6 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
|
|
||||||
!mss && skb->len > VLAN_ETH_FRAME_LEN)
|
|
||||||
base_flags |= TXD_FLAG_JMB_PKT;
|
|
||||||
|
|
||||||
len = skb_headlen(skb);
|
len = skb_headlen(skb);
|
||||||
|
|
||||||
mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);
|
mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);
|
||||||
|
@ -14079,7 +14080,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
|
||||||
/* BCM5785 devices are effectively PCIe devices, and should
|
/* BCM5785 devices are effectively PCIe devices, and should
|
||||||
* follow PCIe codepaths, but do not have a PCIe capabilities
|
* follow PCIe codepaths, but do not have a PCIe capabilities
|
||||||
* section.
|
* section.
|
||||||
*/
|
*/
|
||||||
tg3_flag_set(tp, PCI_EXPRESS);
|
tg3_flag_set(tp, PCI_EXPRESS);
|
||||||
} else if (!tg3_flag(tp, 5705_PLUS) ||
|
} else if (!tg3_flag(tp, 5705_PLUS) ||
|
||||||
tg3_flag(tp, 5780_CLASS)) {
|
tg3_flag(tp, 5780_CLASS)) {
|
||||||
|
@ -15539,7 +15540,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
|
||||||
tnapi->tx_pending = TG3_DEF_TX_RING_PENDING;
|
tnapi->tx_pending = TG3_DEF_TX_RING_PENDING;
|
||||||
|
|
||||||
tnapi->int_mbox = intmbx;
|
tnapi->int_mbox = intmbx;
|
||||||
if (i < 4)
|
if (i <= 4)
|
||||||
intmbx += 0x8;
|
intmbx += 0x8;
|
||||||
else
|
else
|
||||||
intmbx += 0x4;
|
intmbx += 0x4;
|
||||||
|
|
Loading…
Reference in a new issue