aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2009-12-02 12:02:14 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-02 22:57:16 -0500
commit94e5b651595a8eb77665787f7559a6a7c916c195 (patch)
tree95ea19611b18619ad72d75d68174e97807bc4f6b
parentc81c2d95449cd218c2022ce6014c52fef1eb1f66 (diff)
e1000e: check_polarity function pointers not set for 8257x
The function pointers for 8257x devices are not set. This is not really a problem now because there is nothing in the driver that references the pointers for this particular MAC-family (the appropriate functions are called directly), but the pointers should be set in case they are used in the future. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/e1000e/82571.c3
-rw-r--r--drivers/net/e1000e/es2lan.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index f6f3a2289e03..c1a42cfc80ba 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -1714,6 +1714,7 @@ static struct e1000_mac_operations e82571_mac_ops = {
1714 1714
1715static struct e1000_phy_operations e82_phy_ops_igp = { 1715static struct e1000_phy_operations e82_phy_ops_igp = {
1716 .acquire = e1000_get_hw_semaphore_82571, 1716 .acquire = e1000_get_hw_semaphore_82571,
1717 .check_polarity = e1000_check_polarity_igp,
1717 .check_reset_block = e1000e_check_reset_block_generic, 1718 .check_reset_block = e1000e_check_reset_block_generic,
1718 .commit = NULL, 1719 .commit = NULL,
1719 .force_speed_duplex = e1000e_phy_force_speed_duplex_igp, 1720 .force_speed_duplex = e1000e_phy_force_speed_duplex_igp,
@@ -1731,6 +1732,7 @@ static struct e1000_phy_operations e82_phy_ops_igp = {
1731 1732
1732static struct e1000_phy_operations e82_phy_ops_m88 = { 1733static struct e1000_phy_operations e82_phy_ops_m88 = {
1733 .acquire = e1000_get_hw_semaphore_82571, 1734 .acquire = e1000_get_hw_semaphore_82571,
1735 .check_polarity = e1000_check_polarity_m88,
1734 .check_reset_block = e1000e_check_reset_block_generic, 1736 .check_reset_block = e1000e_check_reset_block_generic,
1735 .commit = e1000e_phy_sw_reset, 1737 .commit = e1000e_phy_sw_reset,
1736 .force_speed_duplex = e1000e_phy_force_speed_duplex_m88, 1738 .force_speed_duplex = e1000e_phy_force_speed_duplex_m88,
@@ -1748,6 +1750,7 @@ static struct e1000_phy_operations e82_phy_ops_m88 = {
1748 1750
1749static struct e1000_phy_operations e82_phy_ops_bm = { 1751static struct e1000_phy_operations e82_phy_ops_bm = {
1750 .acquire = e1000_get_hw_semaphore_82571, 1752 .acquire = e1000_get_hw_semaphore_82571,
1753 .check_polarity = e1000_check_polarity_m88,
1751 .check_reset_block = e1000e_check_reset_block_generic, 1754 .check_reset_block = e1000e_check_reset_block_generic,
1752 .commit = e1000e_phy_sw_reset, 1755 .commit = e1000e_phy_sw_reset,
1753 .force_speed_duplex = e1000e_phy_force_speed_duplex_m88, 1756 .force_speed_duplex = e1000e_phy_force_speed_duplex_m88,
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index c7bc657b5da2..d2a104794609 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -1391,6 +1391,7 @@ static struct e1000_mac_operations es2_mac_ops = {
1391 1391
1392static struct e1000_phy_operations es2_phy_ops = { 1392static struct e1000_phy_operations es2_phy_ops = {
1393 .acquire = e1000_acquire_phy_80003es2lan, 1393 .acquire = e1000_acquire_phy_80003es2lan,
1394 .check_polarity = e1000_check_polarity_m88,
1394 .check_reset_block = e1000e_check_reset_block_generic, 1395 .check_reset_block = e1000e_check_reset_block_generic,
1395 .commit = e1000e_phy_sw_reset, 1396 .commit = e1000e_phy_sw_reset,
1396 .force_speed_duplex = e1000_phy_force_speed_duplex_80003es2lan, 1397 .force_speed_duplex = e1000_phy_force_speed_duplex_80003es2lan,