2021-05-19 19:16:13

by Hui Tang

[permalink] [raw]
Subject: [PATCH 00/20] net: ethernet: 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/'

Hui Tang (20):
net: 3com: remove leading spaces before tabs
net: alteon: remove leading spaces before tabs
net: amd: remove leading spaces before tabs
net: apple: remove leading spaces before tabs
net: broadcom: remove leading spaces before tabs
net: chelsio: remove leading spaces before tabs
net: dec: remove leading spaces before tabs
net: dlink: remove leading spaces before tabs
net: ibm: remove leading spaces before tabs
net: marvell: remove leading spaces before tabs
net: natsemi: remove leading spaces before tabs
net: realtek: remove leading spaces before tabs
net: seeq: remove leading spaces before tabs
net: sis: remove leading spaces before tabs
net: smsc: remove leading spaces before tabs
net: sun: remove leading spaces before tabs
net: fealnx: remove leading spaces before tabs
net: xircom: remove leading spaces before tabs
net: 8390: remove leading spaces before tabs
net: fujitsu: remove leading spaces before tabs

drivers/net/ethernet/3com/3c59x.c | 2 +-
drivers/net/ethernet/8390/axnet_cs.c | 14 +++++-----
drivers/net/ethernet/8390/pcnet_cs.c | 2 +-
drivers/net/ethernet/8390/smc-ultra.c | 6 ++--
drivers/net/ethernet/8390/stnic.c | 2 +-
drivers/net/ethernet/alteon/acenic.c | 26 ++++++++---------
drivers/net/ethernet/amd/amd8111e.c | 4 +--
drivers/net/ethernet/amd/amd8111e.h | 6 ++--
drivers/net/ethernet/amd/atarilance.c | 2 +-
drivers/net/ethernet/amd/declance.c | 2 +-
drivers/net/ethernet/amd/lance.c | 4 +--
drivers/net/ethernet/amd/ni65.c | 12 ++++----
drivers/net/ethernet/amd/nmclan_cs.c | 12 ++++----
drivers/net/ethernet/amd/sun3lance.c | 12 ++++----
drivers/net/ethernet/apple/bmac.c | 30 ++++++++++----------
drivers/net/ethernet/apple/mace.c | 8 +++---
drivers/net/ethernet/broadcom/b44.c | 20 ++++++-------
drivers/net/ethernet/broadcom/bnx2.c | 6 ++--
drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +-
drivers/net/ethernet/dec/tulip/de2104x.c | 4 +--
drivers/net/ethernet/dec/tulip/de4x5.c | 6 ++--
drivers/net/ethernet/dec/tulip/dmfe.c | 18 ++++++------
drivers/net/ethernet/dec/tulip/pnic2.c | 4 +--
drivers/net/ethernet/dec/tulip/uli526x.c | 10 +++----
drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +--
drivers/net/ethernet/dlink/sundance.c | 12 ++++----
drivers/net/ethernet/fealnx.c | 2 +-
drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 6 ++--
drivers/net/ethernet/ibm/emac/emac.h | 2 +-
drivers/net/ethernet/marvell/skge.h | 2 +-
drivers/net/ethernet/marvell/sky2.c | 30 ++++++++++----------
drivers/net/ethernet/marvell/sky2.h | 8 +++---
drivers/net/ethernet/natsemi/natsemi.c | 6 ++--
drivers/net/ethernet/realtek/8139cp.c | 6 ++--
drivers/net/ethernet/realtek/8139too.c | 6 ++--
drivers/net/ethernet/realtek/atp.c | 4 +--
drivers/net/ethernet/seeq/ether3.c | 10 +++----
drivers/net/ethernet/sis/sis900.c | 22 +++++++--------
drivers/net/ethernet/smsc/smc9194.c | 42 ++++++++++++++--------------
drivers/net/ethernet/smsc/smc91x.c | 14 +++++-----
drivers/net/ethernet/sun/cassini.c | 2 +-
drivers/net/ethernet/sun/sungem.c | 20 ++++++-------
drivers/net/ethernet/sun/sunhme.c | 6 ++--
drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +-
44 files changed, 210 insertions(+), 210 deletions(-)

--
2.8.1



2021-05-19 19:16:21

by Hui Tang

[permalink] [raw]
Subject: [PATCH 02/20] net: alteon: 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: Jes Sorensen <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/net/ethernet/alteon/acenic.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index 1a7e4df..9dc12b1 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
@@ -1883,16 +1883,16 @@ static u32 ace_handle_event(struct net_device *dev, u32 evtcsm, u32 evtprd)
}
}

- if (ACE_IS_TIGON_I(ap)) {
- struct cmd cmd;
- cmd.evt = C_SET_RX_JUMBO_PRD_IDX;
- cmd.code = 0;
- cmd.idx = 0;
- ace_issue_cmd(ap->regs, &cmd);
- } else {
- writel(0, &((ap->regs)->RxJumboPrd));
- wmb();
- }
+ if (ACE_IS_TIGON_I(ap)) {
+ struct cmd cmd;
+ cmd.evt = C_SET_RX_JUMBO_PRD_IDX;
+ cmd.code = 0;
+ cmd.idx = 0;
+ ace_issue_cmd(ap->regs, &cmd);
+ } else {
+ writel(0, &((ap->regs)->RxJumboPrd));
+ wmb();
+ }

ap->jumbo = 0;
ap->rx_jumbo_skbprd = 0;
@@ -2489,9 +2489,9 @@ static netdev_tx_t ace_start_xmit(struct sk_buff *skb,
}
}

- wmb();
- ap->tx_prd = idx;
- ace_set_txprd(regs, ap, idx);
+ wmb();
+ ap->tx_prd = idx;
+ ace_set_txprd(regs, ap, idx);

if (flagsize & BD_FLG_COAL_NOW) {
netif_stop_queue(dev);
--
2.8.1


2021-05-19 19:16:28

by Hui Tang

[permalink] [raw]
Subject: [PATCH 08/20] net: dlink: 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: "Alexander A. Klimov" <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/net/ethernet/dlink/sundance.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index ce61f79f..ee0ca71 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -1847,20 +1847,20 @@ static int netdev_close(struct net_device *dev)
/* Stop the chip's Tx and Rx processes. */
iowrite16(TxDisable | RxDisable | StatsDisable, ioaddr + MACCtrl1);

- for (i = 2000; i > 0; i--) {
- if ((ioread32(ioaddr + DMACtrl) & 0xc000) == 0)
+ for (i = 2000; i > 0; i--) {
+ if ((ioread32(ioaddr + DMACtrl) & 0xc000) == 0)
break;
mdelay(1);
- }
+ }

- iowrite16(GlobalReset | DMAReset | FIFOReset | NetworkReset,
+ iowrite16(GlobalReset | DMAReset | FIFOReset | NetworkReset,
ioaddr + ASIC_HI_WORD(ASICCtrl));

- for (i = 2000; i > 0; i--) {
+ for (i = 2000; i > 0; i--) {
if ((ioread16(ioaddr + ASIC_HI_WORD(ASICCtrl)) & ResetBusy) == 0)
break;
mdelay(1);
- }
+ }

#ifdef __i386__
if (netif_msg_hw(np)) {
--
2.8.1


2021-05-19 19:17:04

by Hui Tang

[permalink] [raw]
Subject: [PATCH 10/20] 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 <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/net/ethernet/marvell/skge.h | 2 +-
drivers/net/ethernet/marvell/sky2.c | 30 +++++++++++++++---------------
drivers/net/ethernet/marvell/sky2.h | 8 ++++----
3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/net/ethernet/marvell/skge.h b/drivers/net/ethernet/marvell/skge.h
index 6928abc..f722173 100644
--- a/drivers/net/ethernet/marvell/skge.h
+++ b/drivers/net/ethernet/marvell/skge.h
@@ -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 */
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 222c323..324c280 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -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 @@ static struct sk_buff *receive_new(struct sky2_port *sky2,
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);

diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h
index b2dddd8..ddec162 100644
--- a/drivers/net/ethernet/marvell/sky2.h
+++ b/drivers/net/ethernet/marvell/sky2.h
@@ -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;
--
2.8.1


2021-05-19 19:17:05

by Hui Tang

[permalink] [raw]
Subject: [PATCH 14/20] net: sis: 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: "Gustavo A. R. Silva" <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/net/ethernet/sis/sis900.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 620c26f..ca9c00b 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -678,12 +678,12 @@ static int sis900_mii_probe(struct net_device *net_dev)
/* Reset phy if default phy is internal sis900 */
if ((sis_priv->mii->phy_id0 == 0x001D) &&
((sis_priv->mii->phy_id1&0xFFF0) == 0x8000))
- status = sis900_reset_phy(net_dev, sis_priv->cur_phy);
+ status = sis900_reset_phy(net_dev, sis_priv->cur_phy);

/* workaround for ICS1893 PHY */
if ((sis_priv->mii->phy_id0 == 0x0015) &&
((sis_priv->mii->phy_id1&0xFFF0) == 0xF440))
- mdio_write(net_dev, sis_priv->cur_phy, 0x0018, 0xD200);
+ mdio_write(net_dev, sis_priv->cur_phy, 0x0018, 0xD200);

if(status & MII_STAT_LINK){
while (poll_bit) {
@@ -727,7 +727,7 @@ static int sis900_mii_probe(struct net_device *net_dev)
static u16 sis900_default_phy(struct net_device * net_dev)
{
struct sis900_private *sis_priv = netdev_priv(net_dev);
- struct mii_phy *phy = NULL, *phy_home = NULL,
+ struct mii_phy *phy = NULL, *phy_home = NULL,
*default_phy = NULL, *phy_lan = NULL;
u16 status;

@@ -1339,18 +1339,18 @@ static void sis900_timer(struct timer_list *t)
} else {
/* Link ON -> OFF */
if (!(status & MII_STAT_LINK)){
- netif_carrier_off(net_dev);
+ netif_carrier_off(net_dev);
if(netif_msg_link(sis_priv))
- printk(KERN_INFO "%s: Media Link Off\n", net_dev->name);
+ printk(KERN_INFO "%s: Media Link Off\n", net_dev->name);

- /* Change mode issue */
- if ((mii_phy->phy_id0 == 0x001D) &&
- ((mii_phy->phy_id1 & 0xFFF0) == 0x8000))
- sis900_reset_phy(net_dev, sis_priv->cur_phy);
+ /* Change mode issue */
+ if ((mii_phy->phy_id0 == 0x001D) &&
+ ((mii_phy->phy_id1 & 0xFFF0) == 0x8000))
+ sis900_reset_phy(net_dev, sis_priv->cur_phy);

sis630_set_eq(net_dev, sis_priv->chipset_rev);

- goto LookForLink;
+ goto LookForLink;
}
}

@@ -2331,7 +2331,7 @@ static int sis900_set_config(struct net_device *dev, struct ifmap *map)
case IF_PORT_10BASE2: /* 10Base2 */
case IF_PORT_AUI: /* AUI */
case IF_PORT_100BASEFX: /* 100BaseFx */
- /* These Modes are not supported (are they?)*/
+ /* These Modes are not supported (are they?)*/
return -EOPNOTSUPP;

default:
--
2.8.1


2021-05-19 19:17:12

by Hui Tang

[permalink] [raw]
Subject: [PATCH 09/20] net: ibm: 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: Sukadev Bhattiprolu <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/net/ethernet/ibm/emac/emac.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ibm/emac/emac.h b/drivers/net/ethernet/ibm/emac/emac.h
index aa9f651..09d3ac3 100644
--- a/drivers/net/ethernet/ibm/emac/emac.h
+++ b/drivers/net/ethernet/ibm/emac/emac.h
@@ -77,7 +77,7 @@ struct emac_regs {
struct {
u32 rsvd1;
u32 revid;
- u32 rsvd2[2];
+ u32 rsvd2[2];
u32 iaht1; /* Reset, R */
u32 iaht2; /* Reset, R */
u32 iaht3; /* Reset, R */
--
2.8.1


2021-05-19 19:17:13

by Hui Tang

[permalink] [raw]
Subject: [PATCH 16/20] net: sun: 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: Vaibhav Gupta <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/net/ethernet/sun/cassini.c | 2 +-
drivers/net/ethernet/sun/sungem.c | 20 ++++++++++----------
drivers/net/ethernet/sun/sunhme.c | 6 +++---
3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index 54f45d8..981685c 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -486,7 +486,7 @@ static cas_page_t *cas_page_alloc(struct cas *cp, const gfp_t flags)
/* initialize spare pool of rx buffers, but allocate during the open */
static void cas_spare_init(struct cas *cp)
{
- spin_lock(&cp->rx_inuse_lock);
+ spin_lock(&cp->rx_inuse_lock);
INIT_LIST_HEAD(&cp->rx_inuse_list);
spin_unlock(&cp->rx_inuse_lock);

diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 9790656..cfb9e21 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -1258,8 +1258,8 @@ static void gem_begin_auto_negotiation(struct gem *gp,
&advertising, ep->link_modes.advertising);

if (gp->phy_type != phy_mii_mdio0 &&
- gp->phy_type != phy_mii_mdio1)
- goto non_mii;
+ gp->phy_type != phy_mii_mdio1)
+ goto non_mii;

/* Setup advertise */
if (found_mii_phy(gp))
@@ -1410,7 +1410,7 @@ static int gem_set_link_modes(struct gem *gp)

if (gp->phy_type == phy_serialink ||
gp->phy_type == phy_serdes) {
- u32 pcs_lpa = readl(gp->regs + PCS_MIILP);
+ u32 pcs_lpa = readl(gp->regs + PCS_MIILP);

if (pcs_lpa & (PCS_MIIADV_SP | PCS_MIIADV_AP))
pause = 1;
@@ -1892,7 +1892,7 @@ static void gem_init_mac(struct gem *gp)

static void gem_init_pause_thresholds(struct gem *gp)
{
- u32 cfg;
+ u32 cfg;

/* Calculate pause thresholds. Setting the OFF threshold to the
* full RX fifo size effectively disables PAUSE generation which
@@ -1914,15 +1914,15 @@ static void gem_init_pause_thresholds(struct gem *gp)
/* Configure the chip "burst" DMA mode & enable some
* HW bug fixes on Apple version
*/
- cfg = 0;
- if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE)
+ cfg = 0;
+ if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE)
cfg |= GREG_CFG_RONPAULBIT | GREG_CFG_ENBUG2FIX;
#if !defined(CONFIG_SPARC64) && !defined(CONFIG_ALPHA)
- cfg |= GREG_CFG_IBURST;
+ cfg |= GREG_CFG_IBURST;
#endif
- cfg |= ((31 << 1) & GREG_CFG_TXDMALIM);
- cfg |= ((31 << 6) & GREG_CFG_RXDMALIM);
- writel(cfg, gp->regs + GREG_CFG);
+ cfg |= ((31 << 1) & GREG_CFG_TXDMALIM);
+ cfg |= ((31 << 6) & GREG_CFG_RXDMALIM);
+ writel(cfg, gp->regs + GREG_CFG);

/* If Infinite Burst didn't stick, then use different
* thresholds (and Apple bug fixes don't exist)
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index 54b53db..a2c1a40 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2286,8 +2286,8 @@ static netdev_tx_t happy_meal_start_xmit(struct sk_buff *skb,
struct net_device *dev)
{
struct happy_meal *hp = netdev_priv(dev);
- int entry;
- u32 tx_flags;
+ int entry;
+ u32 tx_flags;

tx_flags = TXFLAG_OWN;
if (skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -2301,7 +2301,7 @@ static netdev_tx_t happy_meal_start_xmit(struct sk_buff *skb,

spin_lock_irq(&hp->happy_lock);

- if (TX_BUFFS_AVAIL(hp) <= (skb_shinfo(skb)->nr_frags + 1)) {
+ if (TX_BUFFS_AVAIL(hp) <= (skb_shinfo(skb)->nr_frags + 1)) {
netif_stop_queue(dev);
spin_unlock_irq(&hp->happy_lock);
printk(KERN_ERR "%s: BUG! Tx Ring full when queue awake!\n",
--
2.8.1


2021-05-19 19:19:08

by Lijun Pan

[permalink] [raw]
Subject: Re: [PATCH 00/20] net: ethernet: remove leading spaces before tabs



> On May 19, 2021, at 12:30 AM, Hui Tang <[email protected]> wrote:
>
> 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/'
>
> Hui Tang (20):
> net: 3com: remove leading spaces before tabs
> net: alteon: remove leading spaces before tabs
> net: amd: remove leading spaces before tabs
> net: apple: remove leading spaces before tabs
> net: broadcom: remove leading spaces before tabs
> net: chelsio: remove leading spaces before tabs
> net: dec: remove leading spaces before tabs
> net: dlink: remove leading spaces before tabs
> net: ibm: remove leading spaces before tabs
> net: marvell: remove leading spaces before tabs
> net: natsemi: remove leading spaces before tabs
> net: realtek: remove leading spaces before tabs
> net: seeq: remove leading spaces before tabs
> net: sis: remove leading spaces before tabs
> net: smsc: remove leading spaces before tabs
> net: sun: remove leading spaces before tabs
> net: fealnx: remove leading spaces before tabs
> net: xircom: remove leading spaces before tabs
> net: 8390: remove leading spaces before tabs
> net: fujitsu: remove leading spaces before tabs
>
> drivers/net/ethernet/3com/3c59x.c | 2 +-
> drivers/net/ethernet/8390/axnet_cs.c | 14 +++++-----
> drivers/net/ethernet/8390/pcnet_cs.c | 2 +-
> drivers/net/ethernet/8390/smc-ultra.c | 6 ++--
> drivers/net/ethernet/8390/stnic.c | 2 +-
> drivers/net/ethernet/alteon/acenic.c | 26 ++++++++---------
> drivers/net/ethernet/amd/amd8111e.c | 4 +--
> drivers/net/ethernet/amd/amd8111e.h | 6 ++--
> drivers/net/ethernet/amd/atarilance.c | 2 +-
> drivers/net/ethernet/amd/declance.c | 2 +-
> drivers/net/ethernet/amd/lance.c | 4 +--
> drivers/net/ethernet/amd/ni65.c | 12 ++++----
> drivers/net/ethernet/amd/nmclan_cs.c | 12 ++++----
> drivers/net/ethernet/amd/sun3lance.c | 12 ++++----
> drivers/net/ethernet/apple/bmac.c | 30 ++++++++++----------
> drivers/net/ethernet/apple/mace.c | 8 +++---
> drivers/net/ethernet/broadcom/b44.c | 20 ++++++-------
> drivers/net/ethernet/broadcom/bnx2.c | 6 ++--
> drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +-
> drivers/net/ethernet/dec/tulip/de2104x.c | 4 +--
> drivers/net/ethernet/dec/tulip/de4x5.c | 6 ++--
> drivers/net/ethernet/dec/tulip/dmfe.c | 18 ++++++------
> drivers/net/ethernet/dec/tulip/pnic2.c | 4 +--
> drivers/net/ethernet/dec/tulip/uli526x.c | 10 +++----
> drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +--
> drivers/net/ethernet/dlink/sundance.c | 12 ++++----
> drivers/net/ethernet/fealnx.c | 2 +-
> drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 6 ++--
> drivers/net/ethernet/ibm/emac/emac.h | 2 +-
> drivers/net/ethernet/marvell/skge.h | 2 +-
> drivers/net/ethernet/marvell/sky2.c | 30 ++++++++++----------
> drivers/net/ethernet/marvell/sky2.h | 8 +++---
> drivers/net/ethernet/natsemi/natsemi.c | 6 ++--
> drivers/net/ethernet/realtek/8139cp.c | 6 ++--
> drivers/net/ethernet/realtek/8139too.c | 6 ++--
> drivers/net/ethernet/realtek/atp.c | 4 +--
> drivers/net/ethernet/seeq/ether3.c | 10 +++----
> drivers/net/ethernet/sis/sis900.c | 22 +++++++--------
> drivers/net/ethernet/smsc/smc9194.c | 42 ++++++++++++++--------------
> drivers/net/ethernet/smsc/smc91x.c | 14 +++++-----
> drivers/net/ethernet/sun/cassini.c | 2 +-
> drivers/net/ethernet/sun/sungem.c | 20 ++++++-------
> drivers/net/ethernet/sun/sunhme.c | 6 ++--
> drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +-
> 44 files changed, 210 insertions(+), 210 deletions(-)
>
> —

It should be targeting net-next, I believe.



2021-05-19 20:22:41

by patchwork-bot+netdevbpf

[permalink] [raw]
Subject: Re: [PATCH 00/20] net: ethernet: remove leading spaces before tabs

Hello:

This series was applied to netdev/net-next.git (refs/heads/master):

On Wed, 19 May 2021 13:30:33 +0800 you wrote:
> 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/'
>
> Hui Tang (20):
> net: 3com: remove leading spaces before tabs
> net: alteon: remove leading spaces before tabs
> net: amd: remove leading spaces before tabs
> net: apple: remove leading spaces before tabs
> net: broadcom: remove leading spaces before tabs
> net: chelsio: remove leading spaces before tabs
> net: dec: remove leading spaces before tabs
> net: dlink: remove leading spaces before tabs
> net: ibm: remove leading spaces before tabs
> net: marvell: remove leading spaces before tabs
> net: natsemi: remove leading spaces before tabs
> net: realtek: remove leading spaces before tabs
> net: seeq: remove leading spaces before tabs
> net: sis: remove leading spaces before tabs
> net: smsc: remove leading spaces before tabs
> net: sun: remove leading spaces before tabs
> net: fealnx: remove leading spaces before tabs
> net: xircom: remove leading spaces before tabs
> net: 8390: remove leading spaces before tabs
> net: fujitsu: remove leading spaces before tabs
>
> [...]

Here is the summary with links:
- [01/20] net: 3com: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/959dc069aed8
- [02/20] net: alteon: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/40b1f92676f2
- [03/20] net: amd: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/106b4cb59766
- [04/20] net: apple: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/a22cf81d634c
- [05/20] net: broadcom: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/90e4403a6d37
- [06/20] net: chelsio: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/21b128fde6e0
- [07/20] net: dec: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/cf82f9b165e4
- [08/20] net: dlink: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/e6f0f977407f
- [09/20] net: ibm: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/c11c900143e4
- [10/20] net: marvell: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/717dc24dc5d6
- [11/20] net: natsemi: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/4a0949778c4e
- [12/20] net: realtek: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/f95a73a8a8a8
- [13/20] net: seeq: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/bf53445d81e3
- [14/20] net: sis: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/a294ddfccb45
- [15/20] net: smsc: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/996d7ab8badf
- [16/20] net: sun: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/b54f440cb871
- [17/20] net: fealnx: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/d1e4916fa703
- [18/20] net: xircom: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/223f02acce1a
- [19/20] net: 8390: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/59909c1ab71d
- [20/20] net: fujitsu: remove leading spaces before tabs
https://git.kernel.org/netdev/net-next/c/2174fbd71914

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



2021-05-19 20:24:30

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 00/20] net: ethernet: remove leading spaces before tabs

From: Lijun Pan <[email protected]>
Date: Wed, 19 May 2021 01:06:28 -0500

> It should be targeting net-next, I believe.

That's where I applied this series, so no worries.