Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 172090
b: refs/heads/master
c: 94e5b65
h: refs/heads/master
v: v3
  • Loading branch information
Bruce Allan authored and David S. Miller committed Dec 3, 2009
1 parent e3906b7 commit 71b8bdf
Show file tree
Hide file tree
Showing 3 changed files with 5 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: c81c2d95449cd218c2022ce6014c52fef1eb1f66
refs/heads/master: 94e5b651595a8eb77665787f7559a6a7c916c195
3 changes: 3 additions & 0 deletions trunk/drivers/net/e1000e/82571.c
Original file line number Diff line number Diff line change
Expand Up @@ -1714,6 +1714,7 @@ static struct e1000_mac_operations e82571_mac_ops = {

static struct e1000_phy_operations e82_phy_ops_igp = {
.acquire = e1000_get_hw_semaphore_82571,
.check_polarity = e1000_check_polarity_igp,
.check_reset_block = e1000e_check_reset_block_generic,
.commit = NULL,
.force_speed_duplex = e1000e_phy_force_speed_duplex_igp,
Expand All @@ -1731,6 +1732,7 @@ static struct e1000_phy_operations e82_phy_ops_igp = {

static struct e1000_phy_operations e82_phy_ops_m88 = {
.acquire = e1000_get_hw_semaphore_82571,
.check_polarity = e1000_check_polarity_m88,
.check_reset_block = e1000e_check_reset_block_generic,
.commit = e1000e_phy_sw_reset,
.force_speed_duplex = e1000e_phy_force_speed_duplex_m88,
Expand All @@ -1748,6 +1750,7 @@ static struct e1000_phy_operations e82_phy_ops_m88 = {

static struct e1000_phy_operations e82_phy_ops_bm = {
.acquire = e1000_get_hw_semaphore_82571,
.check_polarity = e1000_check_polarity_m88,
.check_reset_block = e1000e_check_reset_block_generic,
.commit = e1000e_phy_sw_reset,
.force_speed_duplex = e1000e_phy_force_speed_duplex_m88,
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/net/e1000e/es2lan.c
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,7 @@ static struct e1000_mac_operations es2_mac_ops = {

static struct e1000_phy_operations es2_phy_ops = {
.acquire = e1000_acquire_phy_80003es2lan,
.check_polarity = e1000_check_polarity_m88,
.check_reset_block = e1000e_check_reset_block_generic,
.commit = e1000e_phy_sw_reset,
.force_speed_duplex = e1000_phy_force_speed_duplex_80003es2lan,
Expand Down

0 comments on commit 71b8bdf

Please sign in to comment.