diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2010-01-13 02:05:18 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-13 20:31:57 -0800 |
| commit | f4d2dd4cd4d001f5dc20fc76c780c0c20c000c23 (patch) | |
| tree | c056667e1787a0f9c63d42f7a61924cf98a52eb5 /drivers/net/e1000e/es2lan.c | |
| parent | 608f8a0d014db6cd18d4f535934d4b5d556e3013 (diff) | |
| download | kernel_samsung_smdk4412-f4d2dd4cd4d001f5dc20fc76c780c0c20c000c23.zip kernel_samsung_smdk4412-f4d2dd4cd4d001f5dc20fc76c780c0c20c000c23.tar.gz kernel_samsung_smdk4412-f4d2dd4cd4d001f5dc20fc76c780c0c20c000c23.tar.bz2 | |
e1000e: provide MAC-family-specific function to set LAN ID
Provide MAC-specific function pointer to determine the LAN ID (PCI func).
The LAN ID is used internally by the driver to determine which h/w lock
to use to protect accessing the PHY on ESB2 as well as help to determine
the alternate MAC address on some parts.
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>
Diffstat (limited to 'drivers/net/e1000e/es2lan.c')
| -rw-r--r-- | drivers/net/e1000e/es2lan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c index 4bb9d88..27d2158 100644 --- a/drivers/net/e1000e/es2lan.c +++ b/drivers/net/e1000e/es2lan.c @@ -246,6 +246,9 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter) break; } + /* set lan id for port to determine which phy lock to use */ + hw->mac.ops.set_lan_id(hw); + return 0; } @@ -1435,6 +1438,7 @@ static struct e1000_mac_operations es2_mac_ops = { .cleanup_led = e1000e_cleanup_led_generic, .clear_hw_cntrs = e1000_clear_hw_cntrs_80003es2lan, .get_bus_info = e1000e_get_bus_info_pcie, + .set_lan_id = e1000_set_lan_id_multi_port_pcie, .get_link_up_info = e1000_get_link_up_info_80003es2lan, .led_on = e1000e_led_on_generic, .led_off = e1000e_led_off_generic, |