diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-08 06:08:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-08 06:08:41 +0200 |
| commit | b6741d1fe947f829bd4303397fd888e1d4b66bae (patch) | |
| tree | a41c8cf58ddfd82d3083b666479a82df018297f7 /drivers/net/ixgbe/ixgbe_82599.c | |
| parent | Merge branch 'for-greg' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/... (diff) | |
| parent | Linux 3.1-rc1 (diff) | |
| download | linux-b6741d1fe947f829bd4303397fd888e1d4b66bae.tar.xz linux-b6741d1fe947f829bd4303397fd888e1d4b66bae.zip | |
Merge 3.1-rc1 into usb-linus
Gives us a good starting point to base patches off of.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_82599.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_82599.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index 3b3dd4df4c5c..34f30ec79c2e 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c @@ -213,6 +213,7 @@ static s32 ixgbe_init_phy_ops_82599(struct ixgbe_hw *hw) switch (hw->phy.type) { case ixgbe_phy_tn: phy->ops.check_link = &ixgbe_check_phy_link_tnx; + phy->ops.setup_link = &ixgbe_setup_phy_link_tnx; phy->ops.get_firmware_version = &ixgbe_get_phy_firmware_version_tnx; break; |