net: marvell: remove leading spaces before tabs
There are a few leading spaces before tabs and remove it by running the following commard: $ find . -name '*.c' | xargs sed -r -i 's/^[ ]+\t/\t/' $ find . -name '*.h' | xargs sed -r -i 's/^[ ]+\t/\t/' Cc: Lorenzo Bianconi <lorenzo@kernel.org> Signed-off-by: Hui Tang <tanghui20@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
c11c900143
Коммит
717dc24dc5
|
@ -263,7 +263,7 @@ enum {
|
|||
CHIP_ID_YUKON_LP = 0xb2, /* Chip ID for YUKON-LP */
|
||||
CHIP_ID_YUKON_XL = 0xb3, /* Chip ID for YUKON-2 XL */
|
||||
CHIP_ID_YUKON_EC = 0xb6, /* Chip ID for YUKON-2 EC */
|
||||
CHIP_ID_YUKON_FE = 0xb7, /* Chip ID for YUKON-2 FE */
|
||||
CHIP_ID_YUKON_FE = 0xb7, /* Chip ID for YUKON-2 FE */
|
||||
|
||||
CHIP_REV_YU_LITE_A1 = 3, /* Chip Rev. for YUKON-Lite A1,A2 */
|
||||
CHIP_REV_YU_LITE_A3 = 7, /* Chip Rev. for YUKON-Lite A3 */
|
||||
|
|
|
@ -471,7 +471,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
|
|||
adv |= fiber_fc_adv[sky2->flow_mode];
|
||||
} else {
|
||||
reg |= GM_GPCR_AU_FCT_DIS;
|
||||
reg |= gm_fc_disable[sky2->flow_mode];
|
||||
reg |= gm_fc_disable[sky2->flow_mode];
|
||||
|
||||
/* Forward pause packets to GMAC? */
|
||||
if (sky2->flow_mode & FC_RX)
|
||||
|
@ -1656,16 +1656,16 @@ static void sky2_hw_up(struct sky2_port *sky2)
|
|||
tx_init(sky2);
|
||||
|
||||
/*
|
||||
* On dual port PCI-X card, there is an problem where status
|
||||
* On dual port PCI-X card, there is an problem where status
|
||||
* can be received out of order due to split transactions
|
||||
*/
|
||||
if (otherdev && netif_running(otherdev) &&
|
||||
(cap = pci_find_capability(hw->pdev, PCI_CAP_ID_PCIX))) {
|
||||
u16 cmd;
|
||||
(cap = pci_find_capability(hw->pdev, PCI_CAP_ID_PCIX))) {
|
||||
u16 cmd;
|
||||
|
||||
cmd = sky2_pci_read16(hw, cap + PCI_X_CMD);
|
||||
cmd &= ~PCI_X_CMD_MAX_SPLIT;
|
||||
sky2_pci_write16(hw, cap + PCI_X_CMD, cmd);
|
||||
cmd &= ~PCI_X_CMD_MAX_SPLIT;
|
||||
sky2_pci_write16(hw, cap + PCI_X_CMD, cmd);
|
||||
}
|
||||
|
||||
sky2_mac_init(hw, port);
|
||||
|
@ -1836,8 +1836,8 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,
|
|||
u16 mss;
|
||||
u8 ctrl;
|
||||
|
||||
if (unlikely(tx_avail(sky2) < tx_le_req(skb)))
|
||||
return NETDEV_TX_BUSY;
|
||||
if (unlikely(tx_avail(sky2) < tx_le_req(skb)))
|
||||
return NETDEV_TX_BUSY;
|
||||
|
||||
len = skb_headlen(skb);
|
||||
mapping = dma_map_single(&hw->pdev->dev, skb->data, len,
|
||||
|
@ -1866,9 +1866,9 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,
|
|||
if (!(hw->flags & SKY2_HW_NEW_LE))
|
||||
mss += ETH_HLEN + ip_hdrlen(skb) + tcp_hdrlen(skb);
|
||||
|
||||
if (mss != sky2->tx_last_mss) {
|
||||
if (mss != sky2->tx_last_mss) {
|
||||
le = get_tx_le(sky2, &slot);
|
||||
le->addr = cpu_to_le32(mss);
|
||||
le->addr = cpu_to_le32(mss);
|
||||
|
||||
if (hw->flags & SKY2_HW_NEW_LE)
|
||||
le->opcode = OP_MSS | HW_OWNER;
|
||||
|
@ -1895,8 +1895,8 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,
|
|||
/* Handle TCP checksum offload */
|
||||
if (skb->ip_summed == CHECKSUM_PARTIAL) {
|
||||
/* On Yukon EX (some versions) encoding change. */
|
||||
if (hw->flags & SKY2_HW_AUTO_TX_SUM)
|
||||
ctrl |= CALSUM; /* auto checksum */
|
||||
if (hw->flags & SKY2_HW_AUTO_TX_SUM)
|
||||
ctrl |= CALSUM; /* auto checksum */
|
||||
else {
|
||||
const unsigned offset = skb_transport_offset(skb);
|
||||
u32 tcpsum;
|
||||
|
@ -2557,7 +2557,7 @@ nobuf:
|
|||
static struct sk_buff *sky2_receive(struct net_device *dev,
|
||||
u16 length, u32 status)
|
||||
{
|
||||
struct sky2_port *sky2 = netdev_priv(dev);
|
||||
struct sky2_port *sky2 = netdev_priv(dev);
|
||||
struct rx_ring_info *re = sky2->rx_ring + sky2->rx_next;
|
||||
struct sk_buff *skb = NULL;
|
||||
u16 count = (status & GMR_FS_LEN) >> 16;
|
||||
|
@ -5063,11 +5063,11 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
if (!disable_msi && pci_enable_msi(pdev) == 0) {
|
||||
err = sky2_test_msi(hw);
|
||||
if (err) {
|
||||
pci_disable_msi(pdev);
|
||||
pci_disable_msi(pdev);
|
||||
if (err != -EOPNOTSUPP)
|
||||
goto err_out_free_netdev;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_WEIGHT);
|
||||
|
||||
|
|
|
@ -538,8 +538,8 @@ enum {
|
|||
CHIP_ID_YUKON_EC_U = 0xb4, /* YUKON-2 EC Ultra */
|
||||
CHIP_ID_YUKON_EX = 0xb5, /* YUKON-2 Extreme */
|
||||
CHIP_ID_YUKON_EC = 0xb6, /* YUKON-2 EC */
|
||||
CHIP_ID_YUKON_FE = 0xb7, /* YUKON-2 FE */
|
||||
CHIP_ID_YUKON_FE_P = 0xb8, /* YUKON-2 FE+ */
|
||||
CHIP_ID_YUKON_FE = 0xb7, /* YUKON-2 FE */
|
||||
CHIP_ID_YUKON_FE_P = 0xb8, /* YUKON-2 FE+ */
|
||||
CHIP_ID_YUKON_SUPR = 0xb9, /* YUKON-2 Supreme */
|
||||
CHIP_ID_YUKON_UL_2 = 0xba, /* YUKON-2 Ultra 2 */
|
||||
CHIP_ID_YUKON_OPT = 0xbc, /* YUKON-2 Optima */
|
||||
|
@ -2262,8 +2262,8 @@ struct sky2_port {
|
|||
#define SKY2_FLAG_AUTO_SPEED 0x0002
|
||||
#define SKY2_FLAG_AUTO_PAUSE 0x0004
|
||||
|
||||
enum flow_control flow_mode;
|
||||
enum flow_control flow_status;
|
||||
enum flow_control flow_mode;
|
||||
enum flow_control flow_status;
|
||||
|
||||
#ifdef CONFIG_SKY2_DEBUG
|
||||
struct dentry *debugfs;
|
||||
|
|
Загрузка…
Ссылка в новой задаче