Commit cf82f9b1 authored by Hui Tang's avatar Hui Tang Committed by David S. Miller

net: dec: 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/'
Signed-off-by: default avatarHui Tang <tanghui20@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 21b128fd
...@@ -832,8 +832,8 @@ static struct net_device_stats *de_get_stats(struct net_device *dev) ...@@ -832,8 +832,8 @@ static struct net_device_stats *de_get_stats(struct net_device *dev)
/* The chip only need report frame silently dropped. */ /* The chip only need report frame silently dropped. */
spin_lock_irq(&de->lock); spin_lock_irq(&de->lock);
if (netif_running(dev) && netif_device_present(dev)) if (netif_running(dev) && netif_device_present(dev))
__de_get_stats(de); __de_get_stats(de);
spin_unlock_irq(&de->lock); spin_unlock_irq(&de->lock);
return &dev->stats; return &dev->stats;
......
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
<earl@exis.net>. <earl@exis.net>.
Updated the PCI interface to conform with the latest Updated the PCI interface to conform with the latest
version. I hope nothing is broken... version. I hope nothing is broken...
Add TX done interrupt modification from suggestion Add TX done interrupt modification from suggestion
by <Austin.Donnelly@cl.cam.ac.uk>. by <Austin.Donnelly@cl.cam.ac.uk>.
Fix is_anc_capable() bug reported by Fix is_anc_capable() bug reported by
<Austin.Donnelly@cl.cam.ac.uk>. <Austin.Donnelly@cl.cam.ac.uk>.
...@@ -1499,7 +1499,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev) ...@@ -1499,7 +1499,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
spin_lock_irqsave(&lp->lock, flags); spin_lock_irqsave(&lp->lock, flags);
netif_stop_queue(dev); netif_stop_queue(dev);
load_packet(dev, skb->data, TD_IC | TD_LS | TD_FS | skb->len, skb); load_packet(dev, skb->data, TD_IC | TD_LS | TD_FS | skb->len, skb);
lp->stats.tx_bytes += skb->len; lp->stats.tx_bytes += skb->len;
outl(POLL_DEMAND, DE4X5_TPD);/* Start the TX */ outl(POLL_DEMAND, DE4X5_TPD);/* Start the TX */
lp->tx_new = (lp->tx_new + 1) % lp->txRingSize; lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
...@@ -1651,7 +1651,7 @@ de4x5_rx(struct net_device *dev) ...@@ -1651,7 +1651,7 @@ de4x5_rx(struct net_device *dev)
/* Update stats */ /* Update stats */
lp->stats.rx_packets++; lp->stats.rx_packets++;
lp->stats.rx_bytes += pkt_len; lp->stats.rx_bytes += pkt_len;
} }
} }
......
...@@ -518,7 +518,7 @@ static void dmfe_remove_one(struct pci_dev *pdev) ...@@ -518,7 +518,7 @@ static void dmfe_remove_one(struct pci_dev *pdev)
DMFE_DBUG(0, "dmfe_remove_one()", 0); DMFE_DBUG(0, "dmfe_remove_one()", 0);
if (dev) { if (dev) {
unregister_netdev(dev); unregister_netdev(dev);
pci_iounmap(db->pdev, db->ioaddr); pci_iounmap(db->pdev, db->ioaddr);
...@@ -567,10 +567,10 @@ static int dmfe_open(struct net_device *dev) ...@@ -567,10 +567,10 @@ static int dmfe_open(struct net_device *dev)
/* CR6 operation mode decision */ /* CR6 operation mode decision */
if ( !chkmode || (db->chip_id == PCI_DM9132_ID) || if ( !chkmode || (db->chip_id == PCI_DM9132_ID) ||
(db->chip_revision >= 0x30) ) { (db->chip_revision >= 0x30) ) {
db->cr6_data |= DMFE_TXTH_256; db->cr6_data |= DMFE_TXTH_256;
db->cr0_data = CR0_DEFAULT; db->cr0_data = CR0_DEFAULT;
db->dm910x_chk_mode=4; /* Enter the normal mode */ db->dm910x_chk_mode=4; /* Enter the normal mode */
} else { } else {
db->cr6_data |= CR6_SFT; /* Store & Forward mode */ db->cr6_data |= CR6_SFT; /* Store & Forward mode */
db->cr0_data = 0; db->cr0_data = 0;
db->dm910x_chk_mode = 1; /* Enter the check mode */ db->dm910x_chk_mode = 1; /* Enter the check mode */
...@@ -903,7 +903,7 @@ static void dmfe_free_tx_pkt(struct net_device *dev, struct dmfe_board_info *db) ...@@ -903,7 +903,7 @@ static void dmfe_free_tx_pkt(struct net_device *dev, struct dmfe_board_info *db)
} }
} }
txptr = txptr->next_tx_desc; txptr = txptr->next_tx_desc;
}/* End of while */ }/* End of while */
/* Update TX remove pointer to next */ /* Update TX remove pointer to next */
...@@ -1121,7 +1121,7 @@ static void dmfe_timer(struct timer_list *t) ...@@ -1121,7 +1121,7 @@ static void dmfe_timer(struct timer_list *t)
void __iomem *ioaddr = db->ioaddr; void __iomem *ioaddr = db->ioaddr;
u32 tmp_cr8; u32 tmp_cr8;
unsigned char tmp_cr12; unsigned char tmp_cr12;
unsigned long flags; unsigned long flags;
int link_ok, link_ok_phy; int link_ok, link_ok_phy;
...@@ -1217,7 +1217,7 @@ static void dmfe_timer(struct timer_list *t) ...@@ -1217,7 +1217,7 @@ static void dmfe_timer(struct timer_list *t)
if (link_ok_phy != link_ok) { if (link_ok_phy != link_ok) {
DMFE_DBUG (0, "PHY and chip report different link status", 0); DMFE_DBUG (0, "PHY and chip report different link status", 0);
link_ok = link_ok | link_ok_phy; link_ok = link_ok | link_ok_phy;
} }
if ( !link_ok && netif_carrier_ok(dev)) { if ( !link_ok && netif_carrier_ok(dev)) {
/* Link Failed */ /* Link Failed */
...@@ -1699,14 +1699,14 @@ static void dmfe_set_phyxcer(struct dmfe_board_info *db) ...@@ -1699,14 +1699,14 @@ static void dmfe_set_phyxcer(struct dmfe_board_info *db)
if (db->chip_id == PCI_DM9009_ID) phy_reg &= 0x61; if (db->chip_id == PCI_DM9009_ID) phy_reg &= 0x61;
} }
/* Write new capability to Phyxcer Reg4 */ /* Write new capability to Phyxcer Reg4 */
if ( !(phy_reg & 0x01e0)) { if ( !(phy_reg & 0x01e0)) {
phy_reg|=db->PHY_reg4; phy_reg|=db->PHY_reg4;
db->media_mode|=DMFE_AUTO; db->media_mode|=DMFE_AUTO;
} }
dmfe_phy_write(db->ioaddr, db->phy_addr, 4, phy_reg, db->chip_id); dmfe_phy_write(db->ioaddr, db->phy_addr, 4, phy_reg, db->chip_id);
/* Restart Auto-Negotiation */ /* Restart Auto-Negotiation */
if ( db->chip_type && (db->chip_id == PCI_DM9102_ID) ) if ( db->chip_type && (db->chip_id == PCI_DM9102_ID) )
dmfe_phy_write(db->ioaddr, db->phy_addr, 0, 0x1800, db->chip_id); dmfe_phy_write(db->ioaddr, db->phy_addr, 0, 0x1800, db->chip_id);
if ( !db->chip_type ) if ( !db->chip_type )
...@@ -1754,7 +1754,7 @@ static void dmfe_process_mode(struct dmfe_board_info *db) ...@@ -1754,7 +1754,7 @@ static void dmfe_process_mode(struct dmfe_board_info *db)
} }
dmfe_phy_write(db->ioaddr, dmfe_phy_write(db->ioaddr,
db->phy_addr, 0, phy_reg, db->chip_id); db->phy_addr, 0, phy_reg, db->chip_id);
if ( db->chip_type && (db->chip_id == PCI_DM9102_ID) ) if ( db->chip_type && (db->chip_id == PCI_DM9102_ID) )
mdelay(20); mdelay(20);
dmfe_phy_write(db->ioaddr, dmfe_phy_write(db->ioaddr,
db->phy_addr, 0, phy_reg, db->chip_id); db->phy_addr, 0, phy_reg, db->chip_id);
......
...@@ -351,7 +351,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5) ...@@ -351,7 +351,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
del_timer_sync(&tp->timer); del_timer_sync(&tp->timer);
pnic2_start_nway(dev); pnic2_start_nway(dev);
tp->timer.expires = RUN_AT(3*HZ); tp->timer.expires = RUN_AT(3*HZ);
add_timer(&tp->timer); add_timer(&tp->timer);
} }
return; return;
...@@ -375,7 +375,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5) ...@@ -375,7 +375,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
del_timer_sync(&tp->timer); del_timer_sync(&tp->timer);
pnic2_start_nway(dev); pnic2_start_nway(dev);
tp->timer.expires = RUN_AT(3*HZ); tp->timer.expires = RUN_AT(3*HZ);
add_timer(&tp->timer); add_timer(&tp->timer);
} }
return; return;
......
...@@ -780,7 +780,7 @@ static void uli526x_free_tx_pkt(struct net_device *dev, ...@@ -780,7 +780,7 @@ static void uli526x_free_tx_pkt(struct net_device *dev,
} }
} }
txptr = txptr->next_tx_desc; txptr = txptr->next_tx_desc;
}/* End of while */ }/* End of while */
/* Update TX remove pointer to next */ /* Update TX remove pointer to next */
...@@ -1015,7 +1015,7 @@ static void uli526x_timer(struct timer_list *t) ...@@ -1015,7 +1015,7 @@ static void uli526x_timer(struct timer_list *t)
struct net_device *dev = pci_get_drvdata(db->pdev); struct net_device *dev = pci_get_drvdata(db->pdev);
struct uli_phy_ops *phy = &db->phy; struct uli_phy_ops *phy = &db->phy;
void __iomem *ioaddr = db->ioaddr; void __iomem *ioaddr = db->ioaddr;
unsigned long flags; unsigned long flags;
u8 tmp_cr12 = 0; u8 tmp_cr12 = 0;
u32 tmp_cr8; u32 tmp_cr8;
...@@ -1535,14 +1535,14 @@ static void uli526x_set_phyxcer(struct uli526x_board_info *db) ...@@ -1535,14 +1535,14 @@ static void uli526x_set_phyxcer(struct uli526x_board_info *db)
} }
/* Write new capability to Phyxcer Reg4 */ /* Write new capability to Phyxcer Reg4 */
if ( !(phy_reg & 0x01e0)) { if ( !(phy_reg & 0x01e0)) {
phy_reg|=db->PHY_reg4; phy_reg|=db->PHY_reg4;
db->media_mode|=ULI526X_AUTO; db->media_mode|=ULI526X_AUTO;
} }
phy->write(db, db->phy_addr, 4, phy_reg); phy->write(db, db->phy_addr, 4, phy_reg);
/* Restart Auto-Negotiation */ /* Restart Auto-Negotiation */
phy->write(db, db->phy_addr, 0, 0x1200); phy->write(db, db->phy_addr, 0, 0x1200);
udelay(50); udelay(50);
} }
...@@ -1550,7 +1550,7 @@ static void uli526x_set_phyxcer(struct uli526x_board_info *db) ...@@ -1550,7 +1550,7 @@ static void uli526x_set_phyxcer(struct uli526x_board_info *db)
/* /*
* Process op-mode * Process op-mode
AUTO mode : PHY controller in Auto-negotiation Mode AUTO mode : PHY controller in Auto-negotiation Mode
* Force mode: PHY controller in force mode with HUB * Force mode: PHY controller in force mode with HUB
* N-way force capability with SWITCH * N-way force capability with SWITCH
*/ */
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
power management. power management.
support for big endian descriptors support for big endian descriptors
Copyright (C) 2001 Manfred Spraul Copyright (C) 2001 Manfred Spraul
* ethtool support (jgarzik) * ethtool support (jgarzik)
* Replace some MII-related magic numbers with constants (jgarzik) * Replace some MII-related magic numbers with constants (jgarzik)
TODO: TODO:
...@@ -1479,7 +1479,7 @@ static int netdev_close(struct net_device *dev) ...@@ -1479,7 +1479,7 @@ static int netdev_close(struct net_device *dev)
np->cur_rx, np->dirty_rx); np->cur_rx, np->dirty_rx);
} }
/* Stop the chip's Tx and Rx processes. */ /* Stop the chip's Tx and Rx processes. */
spin_lock_irq(&np->lock); spin_lock_irq(&np->lock);
netif_device_detach(dev); netif_device_detach(dev);
update_csr6(dev, 0); update_csr6(dev, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment