Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122609
b: refs/heads/master
c: 84ae48f
h: refs/heads/master
i:
  122607: a2ab7dc
v: v3
  • Loading branch information
Ben Hutchings authored and David S. Miller committed Dec 13, 2008
1 parent cdec183 commit 076870f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2f7f573095132240916a8780cd5ef648c0ad7281
refs/heads/master: 84ae48fe4c1fe8b79fac015df6ad0b0937a7ae37
7 changes: 7 additions & 0 deletions trunk/drivers/net/sfc/efx.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ static unsigned int rss_cpus;
module_param(rss_cpus, uint, 0444);
MODULE_PARM_DESC(rss_cpus, "Number of CPUs to use for Receive-Side Scaling");

static int phy_flash_cfg;
module_param(phy_flash_cfg, int, 0644);
MODULE_PARM_DESC(phy_flash_cfg, "Set PHYs into reflash mode initially");

/**************************************************************************
*
* Utility functions and prototypes
Expand Down Expand Up @@ -609,6 +613,9 @@ static int efx_probe_port(struct efx_nic *efx)
if (rc)
goto err;

if (phy_flash_cfg)
efx->phy_mode = PHY_MODE_SPECIAL;

/* Sanity check MAC address */
if (is_valid_ether_addr(efx->mac_address)) {
memcpy(efx->net_dev->dev_addr, efx->mac_address, ETH_ALEN);
Expand Down

0 comments on commit 076870f

Please sign in to comment.