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

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

tg3: Code movement 



This patch just moves some code around for better organization.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarBenjamin Li <benli@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 997b4f13

drivers/net/ethernet/broadcom/tg3.c

+9 −8
Original line number Diff line number Diff line
@@ -3819,6 +3819,7 @@ static int tg3_copper_is_advertising_all(struct tg3 *tp, u32 mask) 
		if (tg3_ctrl != all_mask)

			return 0;

	}



	return 1;

}
@@ -4119,8 +4120,8 @@ relink: 
			newlnkctl = oldlnkctl | PCI_EXP_LNKCTL_CLKREQ_EN;

		if (newlnkctl != oldlnkctl)

			pci_write_config_word(tp->pdev,

					      pci_pcie_cap(tp->pdev) + PCI_EXP_LNKCTL,

					      newlnkctl);

					      pci_pcie_cap(tp->pdev) +

					      PCI_EXP_LNKCTL, newlnkctl);

	}



	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

	if (vlan_tx_tag_present(skb)) {

		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



	if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&

	    !mss && skb->len > VLAN_ETH_FRAME_LEN)

		base_flags |= TXD_FLAG_JMB_PKT;



	len = skb_headlen(skb);



	mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);
@@ -15539,7 +15540,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 
		tnapi->tx_pending = TG3_DEF_TX_RING_PENDING;



		tnapi->int_mbox = intmbx;

		if (i < 4)

		if (i <= 4)

			intmbx += 0x8;

		else

			intmbx += 0x4;