Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41554
b: refs/heads/master
c: 11e5a20
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Dec 2, 2006
1 parent bdbc814 commit cf3bfd7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b4bdde61bd1f8451801e5fb092cbe2d1050984e
refs/heads/master: 11e5a202ca9e93ecb5ff314a6a345e0e4db77d97
2 changes: 1 addition & 1 deletion trunk/drivers/net/chelsio/cxgb2.c
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)

static int get_eeprom_len(struct net_device *dev)
{
return EEPROM_SIZE;
return EEPROM_SIZE;
}

#define EEPROM_MAGIC(ap) \
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/chelsio/espi.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ int t1_espi_intr_handler(struct peespi *espi)

const struct espi_intr_counts *t1_espi_get_intr_counts(struct peespi *espi)
{
return &espi->intr_cnt;
return &espi->intr_cnt;
}

static void espi_setup_for_pm3393(adapter_t *adapter)
Expand Down
16 changes: 8 additions & 8 deletions trunk/drivers/net/chelsio/pm3393.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@
/* 802.3ae 10Gb/s MDIO Manageable Device(MMD)
*/
enum {
MMD_RESERVED,
MMD_PMAPMD,
MMD_WIS,
MMD_PCS,
MMD_PHY_XGXS, /* XGMII Extender Sublayer */
MMD_DTE_XGXS,
MMD_RESERVED,
MMD_PMAPMD,
MMD_WIS,
MMD_PCS,
MMD_PHY_XGXS, /* XGMII Extender Sublayer */
MMD_DTE_XGXS,
};

enum {
PHY_XGXS_CTRL_1,
PHY_XGXS_STATUS_1
PHY_XGXS_CTRL_1,
PHY_XGXS_STATUS_1
};

#define OFFSET(REG_ADDR) (REG_ADDR << 2)
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/net/chelsio/subr.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ static int t1_pci_intr_handler(adapter_t *adapter)
{
u32 pcix_cause;

pci_read_config_dword(adapter->pdev, A_PCICFG_INTR_CAUSE, &pcix_cause);
pci_read_config_dword(adapter->pdev, A_PCICFG_INTR_CAUSE, &pcix_cause);

if (pcix_cause) {
pci_write_config_dword(adapter->pdev, A_PCICFG_INTR_CAUSE,
pcix_cause);
pcix_cause);
t1_fatal_err(adapter); /* PCI errors are fatal */
}
return 0;
Expand Down Expand Up @@ -420,9 +420,9 @@ int t1_link_start(struct cphy *phy, struct cmac *mac, struct link_config *lc)
*/
int elmer0_ext_intr_handler(adapter_t *adapter)
{
struct cphy *phy;
struct cphy *phy;
int phy_cause;
u32 cause;
u32 cause;

t1_tpi_read(adapter, A_ELMER0_INT_CAUSE, &cause);

Expand Down Expand Up @@ -515,7 +515,7 @@ void t1_interrupts_clear(adapter_t* adapter)
}

/* Enable interrupts for external devices. */
pl_intr = readl(adapter->regs + A_PL_CAUSE);
pl_intr = readl(adapter->regs + A_PL_CAUSE);

writel(pl_intr | F_PL_INTR_EXT | F_PL_INTR_PCIX,
adapter->regs + A_PL_CAUSE);
Expand Down Expand Up @@ -643,7 +643,7 @@ static int board_init(adapter_t *adapter, const struct board_info *bi)
case CHBT_BOARD_N110:
case CHBT_BOARD_N210:
writel(V_TPIPAR(0xf), adapter->regs + A_TPI_PAR);
t1_tpi_write(adapter, A_ELMER0_GPO, 0x800);
t1_tpi_write(adapter, A_ELMER0_GPO, 0x800);
break;
}
return 0;
Expand Down

0 comments on commit cf3bfd7

Please sign in to comment.